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

[FIX] Calendar: quick'n dirty fix for drag'n dropping broken after creating new event 

Added some missing images for calendar

bzr revid: fme@openerp.com-20111212160242-uos5g2qgnscmur0u
This commit is contained in:
Fabien Meghazi 2011-12-12 17:02:42 +01:00
parent b891fd99b7
commit c9dc39f506
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/controlls5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
addons/web_calendar/static/lib/dhtmlxScheduler/codebase/imgs/lightbox.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

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

@ -124,7 +124,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
scheduler.attachEvent('onEventDeleted', this.do_delete_event);
scheduler.attachEvent('onEventChanged', this.do_save_event);
scheduler.attachEvent('onClick', this.do_edit_event);
scheduler.attachEvent('onBeforeLightbox', this.do_edit_event);
scheduler.attachEvent('onLightbox', this.do_edit_event);
scheduler.attachEvent('onViewChange', function(mode, date) {
self.$element.removeClass('oe_cal_day oe_cal_week oe_cal_month').addClass('oe_cal_' + mode);
@ -313,7 +313,6 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
if (index !== null) {
this.dataset.index = index;
this.do_switch_view('page');
return false;
} else if (scheduler.getState().mode === 'month') {
var event_obj = scheduler.getEvent(event_id);
if (event_obj._length === 1) {
@ -322,11 +321,14 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
event_obj['end_date'].addHours(1);
}
this.do_create_event_with_formdialog(event_id, event_obj);
// TODO: check dhtmlxscheduler problem here. At this line, scheduler
// event 'onEventChanged' bound to this.do_save_event() won't be fired !;
return false;
// return false;
// Theorically, returning false should prevent the lightbox to open.
// It works, but then the scheduler is in a buggy state where drag'n drop
// related internal Event won't be fired anymore.
// I tried scheduler.editStop(event_id); but doesn't work either
// After losing one hour on this, here's a quick and very dirty fix :
$(".dhx_cancel_btn").click();
}
return true;
},
get_event_data: function(event_obj) {
var data = {