From 5562530ea513164ba6dc9caa8f2019c110057aa9 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Thu, 4 Oct 2012 19:02:46 +0530 Subject: [PATCH 1/2] [IMP]Remove add_last for on_write_completed bzr revid: vja@tinyerp.com-20121004133246-4atym1p9ib59kgk4 --- addons/web/static/src/js/view_form.js | 9 +++------ addons/web_gantt/static/src/js/gantt.js | 4 +--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 1c32d5ef63e..b6ccc196afd 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2893,7 +2893,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc title: _t("Open: ") + self.string } ); - pop.on_write_completed.add_last(function() { + pop.on('on_write_complete',self,function(){ self.display_value = {}; self.render_value(); self.focus(); @@ -4038,9 +4038,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in title: _t("Open: ") + this.m2m_field.string, readonly: this.getParent().get("effective_readonly") }); - pop.on_write_completed.add_last(function() { - self.reload_content(); - }); + pop.on('on_write_complete',self,self.reload_content); } }); @@ -4287,7 +4285,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ }; this.dataset.write_function = function(id, data, options, sup) { var fct = self.options.write_function || sup; - return fct.call(this, id, data, options).then(self.on_write_completed); + return fct.call(this, id, data, options).then(function(){self.trigger('on_write_complete',self)}); }; this.dataset.parent_view = this.options.parent_view; this.dataset.child_name = this.options.child_name; @@ -4307,7 +4305,6 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ this.$buttonpane = dialog.$el.dialog("widget").find(".ui-dialog-buttonpane").html(""); this.start(); }, - on_write_completed: function() {}, setup_form_view: function() { var self = this; if (this.row_id) { diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 00e057258f1..0d600712d4a 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -211,9 +211,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ on_task_display: function(task) { var self = this; var pop = new instance.web.form.FormOpenPopup(self); - pop.on_write_completed.add_last(function() { - self.reload(); - }); + pop.on('on_write_complete',self,self.reload); pop.show_element( self.dataset.model, task.id, From e00dcf2eb82c8b68f174e3e5cda7dcaed1b3c36d Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Mon, 8 Oct 2012 13:40:26 +0200 Subject: [PATCH 2/2] [FIX] Fixed spacing. bzr revid: vta@openerp.com-20121008114026-zpvwsl3c54anh512 --- addons/web/static/src/js/view_form.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b6ccc196afd..4b78072bbc1 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2893,7 +2893,7 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc title: _t("Open: ") + self.string } ); - pop.on('on_write_complete',self,function(){ + pop.on('on_write_complete', self, function(){ self.display_value = {}; self.render_value(); self.focus(); @@ -4038,7 +4038,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in title: _t("Open: ") + this.m2m_field.string, readonly: this.getParent().get("effective_readonly") }); - pop.on('on_write_complete',self,self.reload_content); + pop.on('on_write_complete', self, self.reload_content); } }); @@ -4285,7 +4285,9 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ }; this.dataset.write_function = function(id, data, options, sup) { var fct = self.options.write_function || sup; - return fct.call(this, id, data, options).then(function(){self.trigger('on_write_complete',self)}); + return fct.call(this, id, data, options).then(function() { + self.trigger('on_write_complete'); + }); }; this.dataset.parent_view = this.options.parent_view; this.dataset.child_name = this.options.child_name;