summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2018-03-23 05:47:35 -0800
committerNicolas Martinelli <nim-odoo@users.noreply.github.com>2018-03-26 09:02:36 +0200
commitcafc6c3ae08e384daaaa9ab2efd523d5e02db6eb (patch)
tree2c2ed095a34585cccf12e702729dfc9f4cb205c0 /addons/web/static/src/js
parent14e69ca5f15560e237b23e187ff628cd8c465d24 (diff)
[FIX] web: incorrect date in calendar
- Set the OS timezone to GMT-6 - Create a project task with a date deadline on D day - The tasks appears at D-1 in the calendar This was supposed to be fixed with 0c0fb63b0d7789b0, but actually no. opw-1815446 opw-1828130
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_model.js7
1 files changed, 3 insertions, 4 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 23c0aea3094..9c18e306582 100644
--- a/addons/web/static/src/js/views/calendar/calendar_model.js
+++ b/addons/web/static/src/js/views/calendar/calendar_model.js
@@ -611,7 +611,8 @@ return AbstractModel.extend({
var date_start;
var date_stop;
var date_delay = evt[this.mapping.date_delay] || 1.0,
- all_day = this.mapping.all_day ? evt[this.mapping.all_day] : false,
+ all_day = this.fields[this.mapping.date_start].type === 'date' ||
+ this.mapping.all_day && evt[this.mapping.all_day] || false,
the_title = '',
attendees = [];
@@ -635,8 +636,6 @@ return AbstractModel.extend({
if (this.mapping.all_day && evt[this.mapping.all_day]) {
date_stop.add(1, 'days');
}
- var isAllDay = this.fields[this.mapping.date_start].type === 'date' ||
- this.mapping.all_day && evt[this.mapping.all_day] || false;
var r = {
'record': evt,
'start': date_start,
@@ -644,7 +643,7 @@ return AbstractModel.extend({
'r_start': date_start,
'r_end': date_stop,
'title': the_title,
- 'allDay': isAllDay,
+ 'allDay': all_day,
'id': evt.id,
'attendees':attendees,
};