From 76cd2cbacfe1c8243331ec198ff0c4b4185746b9 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 24 Nov 2011 12:44:16 +0530 Subject: [PATCH 1/3] [Fix]Fixed code for create a leave request from calendar lp bug: https://launchpad.net/bugs/893498 fixed bzr revid: vme@tinyerp.com-20111124071416-4lbaex4ohouj31yb --- addons/web_calendar/static/src/js/calendar.js | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index 93e798ba804..c24b2d75ca2 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -245,16 +245,23 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({ do_create_event: function(event_id, event_obj) { var self = this, data = this.get_event_data(event_obj); - this.dataset.create(data, function(r) { - var id = parseInt(r.result, 10); - self.dataset.ids.push(id); - scheduler.changeEventId(event_id, id); - self.refresh_minical(); - }, function(r, event) { - self.creating_event_id = event_id; - self.form_dialog.form.on_record_loaded(data); - self.form_dialog.open(); - event.preventDefault(); + this.dataset.call( 'fields_get', [], function(fields) { + self.dataset.default_get(_.keys(fields), function (default_value) { + _.each(default_value ,function(value, key){ + (!_.include(_.keys(data), key))?data[key] = value:false; + self.dataset.create(data, function(r) { + var id = parseInt(r.result, 10); + self.dataset.ids.push(id); + scheduler.changeEventId(event_id, id); + self.refresh_minical(); + }, function(r, event) { + self.creating_event_id = event_id; + self.form_dialog.form.on_record_loaded(data); + self.form_dialog.open(); + event.preventDefault(); + }); + }); + }); }); }, do_save_event: function(event_id, event_obj) { From 0792aa06ba61e215905d4a66dda28c2d4f403a43 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 24 Nov 2011 12:57:07 +0530 Subject: [PATCH 2/3] [Fix]Fixe code. lp bug: https://launchpad.net/bugs/893498 fixed bzr revid: vme@tinyerp.com-20111124072707-x5m1w0fri63115xj --- addons/web_calendar/static/src/js/calendar.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index c24b2d75ca2..7f3c56a4330 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -249,17 +249,17 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({ self.dataset.default_get(_.keys(fields), function (default_value) { _.each(default_value ,function(value, key){ (!_.include(_.keys(data), key))?data[key] = value:false; - self.dataset.create(data, function(r) { - var id = parseInt(r.result, 10); - self.dataset.ids.push(id); - scheduler.changeEventId(event_id, id); - self.refresh_minical(); - }, function(r, event) { - self.creating_event_id = event_id; - self.form_dialog.form.on_record_loaded(data); - self.form_dialog.open(); - event.preventDefault(); - }); + }); + self.dataset.create(data, function(r) { + var id = parseInt(r.result, 10); + self.dataset.ids.push(id); + scheduler.changeEventId(event_id, id); + self.refresh_minical(); + }, function(r, event) { + self.creating_event_id = event_id; + self.form_dialog.form.on_record_loaded(data); + self.form_dialog.open(); + event.preventDefault(); }); }); }); From 0727b2ddd954d535930899c875376c4d0994c2d0 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 1 Dec 2011 11:03:43 +0530 Subject: [PATCH 3/3] [IMP]fix code. bzr revid: vme@tinyerp.com-20111201053343-9utzehww16udk1g2 --- addons/web_calendar/static/src/js/calendar.js | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index 7f3c56a4330..3da1b5dedf6 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -245,24 +245,21 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({ do_create_event: function(event_id, event_obj) { var self = this, data = this.get_event_data(event_obj); - this.dataset.call( 'fields_get', [], function(fields) { - self.dataset.default_get(_.keys(fields), function (default_value) { - _.each(default_value ,function(value, key){ - (!_.include(_.keys(data), key))?data[key] = value:false; - }); - self.dataset.create(data, function(r) { - var id = parseInt(r.result, 10); - self.dataset.ids.push(id); - scheduler.changeEventId(event_id, id); - self.refresh_minical(); - }, function(r, event) { - self.creating_event_id = event_id; - self.form_dialog.form.on_record_loaded(data); - self.form_dialog.open(); - event.preventDefault(); - }); + self.dataset.create(data, function(r) { + var id = parseInt(r.result, 10); + self.dataset.ids.push(id); + scheduler.changeEventId(event_id, id); + self.refresh_minical(); + }, function(r, event) { + self.creating_event_id = event_id; + self.dataset.default_get + (_.difference(_(self.form_dialog.form.fields_view.fields).keys(), _(data).keys()), + function (default_value) { + self.form_dialog.form.on_record_loaded(_.extend(default_value, data)); + self.form_dialog.open(); + }); + event.preventDefault(); }); - }); }, do_save_event: function(event_id, event_obj) { var self = this,