From 43217cc2b431135a74830b4e1de7ce3d2d621fb7 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 11 Oct 2012 12:34:39 +0530 Subject: [PATCH 1/2] [IMP]replace callbackenable from on_select_elements. bzr revid: vme@tinyerp.com-20121011070439-vzcua4yoiwlz2evk --- addons/web/static/src/js/view_form.js | 11 ++++++----- addons/web_diagram/static/src/js/diagram.js | 5 ++--- addons/web_gantt/static/src/js/gantt.js | 2 +- addons/web_kanban/static/src/js/kanban.js | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index afb5e258c0b..6c36cb3d6fe 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2877,7 +2877,7 @@ instance.web.form.CompletionFieldMixin = { self.build_domain(), new instance.web.CompoundContext(self.build_context(), context || {}) ); - pop.on_select_elements.add(function(element_ids) { + pop.on("select_elements",self,function(element_ids) { self.add_id(element_ids[0]); self.focus(); }); @@ -3598,7 +3598,7 @@ instance.web.form.One2ManyViewManager = instance.web.ViewManager.extend({ form_view_options: {'not_interactible_on_create':true}, readonly: self.o2m.get("effective_readonly") }); - pop.on_select_elements.add_last(function() { + pop.on("select_elements", self, function() { self.o2m.reload_current_view(); }); }, @@ -3684,7 +3684,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ self.o2m.build_domain(), self.o2m.build_context() ); - pop.on_select_elements.add_last(function() { + pop.on("select_elements", self, function() { self.o2m.reload_current_view(); }); } @@ -4121,7 +4121,7 @@ instance.web.form.Many2ManyListView = instance.web.ListView.extend(/** @lends in this.m2m_field.build_context() ); var self = this; - pop.on_select_elements.add(function(element_ids) { + pop.on("select_elements", self, function(element_ids) { _.each(element_ids, function(one_id) { if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) { self.dataset.set_ids([].concat(self.dataset.ids, [one_id])); @@ -4236,7 +4236,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend( new instance.web.CompoundDomain(this.build_domain(), ["!", ["id", "in", this.dataset.ids]]), this.build_context() ); - pop.on_select_elements.add(function(element_ids) { + pop.on("select_elements", self, function(element_ids) { _.each(element_ids, function(one_id) { if(! _.detect(self.dataset.ids, function(x) {return x == one_id;})) { self.dataset.set_ids([].concat(self.dataset.ids, [one_id])); @@ -4457,6 +4457,7 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ }); }, on_select_elements: function(element_ids) { + this.trigger("select_elements",element_ids); }, check_exit: function(no_destroy) { if (this.created_elements.length > 0) { diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index 9fd74853c3c..5b699fa7870 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -273,7 +273,7 @@ instance.web.DiagramView = instance.web.View.extend({ self.dataset.domain, self.context || self.dataset.context ); - pop.on_select_elements.add_last(function(element_ids) { + pop.on("select_elements", self, function(element_ids) { self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded); }); @@ -325,8 +325,7 @@ instance.web.DiagramView = instance.web.View.extend({ this.dataset.domain, this.context || this.dataset.context ); - - pop.on_select_elements.add_last(function(element_ids) { + pop.on("select_elements", self, function(element_ids) { self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded); }); // We want to destroy the dummy edge after a creation cancel. This destroys it even if we save the changes. diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index 66d699c2cde..32bfea8e212 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -222,7 +222,7 @@ instance.web_gantt.GanttView = instance.web.View.extend({ on_task_create: function() { var self = this; var pop = new instance.web.form.SelectCreatePopup(this); - pop.on_select_elements.add_last(function() { + pop.on("select_elements", self, function() { self.reload(); }); pop.select_element( diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 537325394e9..37aea87e50e 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1067,7 +1067,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ [], {"default_name": self.$input.val()} ); - pop.on_select_elements.add(function(element_ids) { + pop.on("select_elements", self, function(element_ids) { self.$input.val(""); self.trigger('added', element_ids[0]); }); From 5bb6122f73f080f59ca08f310fa7d8e1875d8b4b Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 11 Oct 2012 15:58:49 +0530 Subject: [PATCH 2/2] [IMP]change method on_selected_elements to elements_selected. bzr revid: vme@tinyerp.com-20121011102849-yn9nldtgqszp70gq --- addons/web/static/src/js/view_form.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 6c36cb3d6fe..377034c0e2a 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -4456,12 +4456,12 @@ instance.web.form.AbstractFormPopup = instance.web.Widget.extend({ self.view_form.do_show(); }); }, - on_select_elements: function(element_ids) { + elements_selected: function(element_ids) { this.trigger("select_elements",element_ids); }, check_exit: function(no_destroy) { if (this.created_elements.length > 0) { - this.on_select_elements(this.created_elements); + this.elements_selected(this.created_elements); this.created_elements = []; } this.destroy(); @@ -4572,7 +4572,7 @@ instance.web.form.SelectCreatePopup = instance.web.form.AbstractFormPopup.extend }); var $sbutton = self.$buttonpane.find(".oe_selectcreatepopup-search-select"); $sbutton.click(function() { - self.on_select_elements(self.selected_ids); + self.elements_selected(self.selected_ids); self.destroy(); }); }); @@ -4614,7 +4614,7 @@ instance.web.form.SelectCreateListView = instance.web.ListView.extend({ this.popup.new_object(); }, select_record: function(index) { - this.popup.on_select_elements([this.dataset.ids[index]]); + this.popup.elements_selected([this.dataset.ids[index]]); this.popup.destroy(); }, do_select: function(ids, records) {