odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Allow to delete events in week and day view 

bzr revid: fme@openerp.com-20121029105303-0x9nnmrteanhbsey
This commit is contained in:
Fabien Meghazi 2012-10-29 11:53:03 +01:00
parent ea570236a6
commit 2c14431fbd
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/web_calendar/static/src/css/web_calendar.css
View File

@ -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;
}
}

2
addons/web_calendar/static/src/css/web_calendar.sass
View File

@ -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

12
addons/web_calendar/static/src/js/calendar.js
View File

@ -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']);