diff --git a/addons/web_calendar/static/src/css/web_calendar.css b/addons/web_calendar/static/src/css/web_calendar.css index dc4502d25b0..e477a88a3e1 100644 --- a/addons/web_calendar/static/src/css/web_calendar.css +++ b/addons/web_calendar/static/src/css/web_calendar.css @@ -24,7 +24,7 @@ .openerp .oe_calendar .oe_calendar_filter { padding: 0 10px; } -.openerp .oe_calendar .dhx_cal_select_menu { +.openerp .oe_calendar .dhx_cal_select_menu .dhx_menu_icon.icon_edit { display: none; } .openerp .oe_calendar.oe_cal_month .dhx_cal_data { @@ -33,12 +33,3 @@ .openerp .oe_calendar.oe_cal_month .dhx_cal_data table tr td:last-child div.dhx_month_body { padding-right: 5px; } -@media print { - div.dhx_cal_navline .dhx_cal_tab, div.dhx_cal_navline .dhx_cal_prev_button, div.dhx_cal_navline .dhx_cal_next_button, div.dhx_cal_navline .dhx_cal_today_button{ - display: none; - } - .openerp .dhx_cal_data { - overflow-y: hidden !important; - position: relative; - } -} \ No newline at end of file diff --git a/addons/web_calendar/static/src/css/web_calendar.sass b/addons/web_calendar/static/src/css/web_calendar.sass index 72a3a262e60..0dc3bfb43bd 100644 --- a/addons/web_calendar/static/src/css/web_calendar.sass +++ b/addons/web_calendar/static/src/css/web_calendar.sass @@ -27,7 +27,7 @@ padding: 0 10px // Dhtmlx Scheduler css overrides - .dhx_cal_select_menu + .dhx_cal_select_menu .dhx_menu_icon.icon_edit display: none &.oe_cal_month .dhx_cal_data diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index e027dd2259d..986b239bb1b 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -173,6 +173,13 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ self[fn].apply(self, arguments); }); scheduler.attachEvent('onClick', function(event_id, mouse_event) { + if (!self.$el.find('.dhx_cal_editor').length && self.current_mode() === 'month') { + self.open_event(event_id); + } else { + return true; + } + }); + scheduler.attachEvent('onDblClick', function(event_id, mouse_event) { if (!self.$el.find('.dhx_cal_editor').length) { self.open_event(event_id); } @@ -368,6 +375,9 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ // no way to select a record anyway return []; }, + current_mode: function() { + return scheduler.getState().mode; + }, quick_save: function(event_id, event_obj) { var self = this; @@ -397,7 +407,7 @@ instance.web_calendar.CalendarView = instance.web.View.extend({ }, slow_create: function(event_id, event_obj) { var self = this; - if (scheduler.getState().mode === 'month') { + if (this.current_mode() === 'month') { event_obj['start_date'].addHours(8); if (event_obj._length === 1) { event_obj['end_date'] = new Date(event_obj['start_date']);