diff options
| author | Romeo Fragomeli <rfr@odoo.com> | 2020-03-16 14:57:43 +0000 |
|---|---|---|
| committer | Pierre Paridans <app@odoo.com> | 2020-03-31 15:06:53 +0000 |
| commit | d57470387aa1a155e004aaebec7b8b66de581dcd (patch) | |
| tree | f47332b778256513725161e00600ce7f217b0ce9 /addons/web/static/src/js/views | |
| parent | 8dfbc7d42148440cb6ede8d291735d92981f8da8 (diff) | |
[FIX] web: calendar's event not correctly ordered in month view
Before this commit, events were sorted by ID in month view.
Event A occurring after event B would be placed on top of B instead
of below.
Steps to reproduce:
* Go in the calendar app
* Insert a event at 12:00
* Insert a event at 8:00
* Insert a event at 14:00
* Go in view month the events are not sorted (BUG)
In month view, events are forced to be "allday", so the sequence used
can't be based on its time but only on its ID.
To fix this, this commit doesn't force the "allday" flag anymore.
Task ID: 2183249
Diffstat (limited to 'addons/web/static/src/js/views')
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_model.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/calendar/calendar_renderer.js | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/calendar/calendar_model.js b/addons/web/static/src/js/views/calendar/calendar_model.js index 78fa6fdaf5e..caa1d26e8c6 100644 --- a/addons/web/static/src/js/views/calendar/calendar_model.js +++ b/addons/web/static/src/js/views/calendar/calendar_model.js @@ -768,7 +768,6 @@ return AbstractModel.extend({ // allow to resize in month mode r.reset_allday = r.allDay; - r.allDay = true; r.start = date_start.toDate(); r.end = date_stop.startOf('day').toDate(); r.showTime = true; diff --git a/addons/web/static/src/js/views/calendar/calendar_renderer.js b/addons/web/static/src/js/views/calendar/calendar_renderer.js index 17ea9da1333..f6ae085e81a 100644 --- a/addons/web/static/src/js/views/calendar/calendar_renderer.js +++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js @@ -413,7 +413,7 @@ return AbstractRenderer.extend({ if (self.$('.o_cw_popover').length) { self._unselectEvent(); } else { - var data = {start: selectionInfo.start, end: selectionInfo.end}; + var data = {start: selectionInfo.start, end: selectionInfo.end, allDay: selectionInfo.allDay}; if (self.state.context.default_name) { data.title = self.state.context.default_name; } |