summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2012-03-28 16:46:20 +0200
committerFabien Meghazi <fme@openerp.com>2012-03-28 16:46:20 +0200
commit8d4de6e4e8b079b3c86eea1191e05a1badbcdd22 (patch)
tree4639ef209908c7351e4e89191982452b452d2218
parent5bfd70df2506abe164c400af8871f178a367d558 (diff)
parent2da2d8ba5e4aa4cff4dff5313f03a28b062974e4 (diff)
[FIX] Save icon in event dialog of calendar's day view won't work
lp bug: https://launchpad.net/bugs/946378 fixed bzr revid: fme@openerp.com-20120328144620-iv3ubh747htn2ar7
-rw-r--r--addons/web_calendar/static/src/js/calendar.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index fd5531b6271..6042ee2fd57 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -339,9 +339,10 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
});
}
},
- do_edit_event: function(event_id) {
+ do_edit_event: function(event_id, evt) {
var self = this;
var index = this.dataset.get_id_index(event_id);
+ debugger
if (index !== null) {
this.dataset.index = index;
this.do_switch_view('page');
@@ -363,6 +364,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
// 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();
+ } else {
+ scheduler.editStop($(evt.target).hasClass('icon_save'));
}
},
get_event_data: function(event_obj) {