summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authorKhoi Nguyen <bng@odoo.com>2017-08-02 13:45:46 +0200
committerKhoi Nguyen <bng@odoo.com>2017-08-02 14:54:45 +0200
commit2258c031ad2a223906f939921969ec55d266113d (patch)
tree2e41b6dcd39f154c794f15b825677cf8bb9e7feb /addons/web/static/src/js
parent211961c3747b5948e80ad8eb6f097636bc61b46d (diff)
[FIX] web: fix traceback when creating an event starting at 12am or 11.30pm
Since the switch to the new views, clicking on a 12am cell in a week view of calendar triggers a traceback. A similar issue happens when creating an event at 11.30pm. This is due to the fact that events starting or ending at 12am are suspected to be incorrect and are thus checked against the database. This commit fixes both issues, by requiring that database checks be carried out only if the records actually exist in the database.
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/views/calendar/calendar_renderer.js7
1 files changed, 4 insertions, 3 deletions
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 4f5719063ff..5fb79cfa3a0 100644
--- a/addons/web/static/src/js/views/calendar/calendar_renderer.js
+++ b/addons/web/static/src/js/views/calendar/calendar_renderer.js
@@ -322,10 +322,11 @@ return AbstractRenderer.extend({
element.addClass($render.attr('class'));
var display_hour = '';
if (!event.allDay) {
- display_hour = (event.start.format('HH:mm') === '00:00' ? event.r_start.format('HH:mm') : event.start.format('HH:mm')) + ' - ' +
- (event.end && event.end.format('HH:mm') !== '00:00' ? event.end.format('HH:mm') : event.r_end.format('HH:mm'));
+ var start = event.r_start || event.start;
+ var end = event.r_end || event.end;
+ display_hour = start.format('HH:mm') + ' - ' + end.format('HH:mm');
if (display_hour === '00:00 - 00:00') {
- display_hour = _t('All the day');
+ display_hour = _t('All day');
}
}
element.find('.fc-content .fc-time').text(display_hour);