diff --git a/sao/CHANGELOG b/sao/CHANGELOG index b996e0ee47..9a21dd938f 100644 --- a/sao/CHANGELOG +++ b/sao/CHANGELOG @@ -1,3 +1,4 @@ +* Support scroll time on calendar view * Save and Restore tree state on List Form * Do record (pre)validation and saving on selection change for list-form views * Eagerly read string value of selection fields diff --git a/sao/src/view/calendar.js b/sao/src/view/calendar.js index 8468b87887..5570e02ba5 100644 --- a/sao/src/view/calendar.js +++ b/sao/src/view/calendar.js @@ -83,6 +83,9 @@ defaultView: defaultview, header: header, timeFormat: 'H:mm', + scrollTime: ( + this.view.screen.context.calendar_scroll_time || + Sao.Time(6)).toString(), events: this.view.get_events.bind(this.view), locale: Sao.i18n.getlang().slice(0, 2), isRTL: Sao.i18n.rtl, diff --git a/trytond/CHANGELOG b/trytond/CHANGELOG index 1bd4302e0b..6533345845 100644 --- a/trytond/CHANGELOG +++ b/trytond/CHANGELOG @@ -1,3 +1,4 @@ +* Add scroll time for calendar view * Allow cache size to be configured * Add local and global list of ignore context keys * Add functions in transaction for check access and active record diff --git a/trytond/doc/topics/views/index.rst b/trytond/doc/topics/views/index.rst index 261cf35798..736ac4933d 100644 --- a/trytond/doc/topics/views/index.rst +++ b/trytond/doc/topics/views/index.rst @@ -968,6 +968,10 @@ The RNG that describes the XML for a calendar view is stored in ``trytond/ir/ui/calendar.rng``. There is also a RNC in ``trytond/ir/ui/calendar.rnc``. +The ``calendar_scroll_time`` context key determines the initial time to scroll +to. +The default value is ``datetime.time(6)``. + calendar --------