From 884aecd5df0c9760a14888dcab6b8f5d6b1655bb Mon Sep 17 00:00:00 2001 From: Vishmita Date: Tue, 9 Oct 2012 19:07:04 +0530 Subject: [PATCH 1/3] [IMP]replace callenabled for on_pager_action bzr revid: vja@tinyerp.com-20121009133704-d2xzc6zssbzzmlwn --- addons/web/static/src/js/view_form.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 8e7364ee50a..898f776db8f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -459,7 +459,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } this.$pager.on('click','a[data-pager-action]',function() { var action = $(this).data('pager-action'); - self.on_pager_action(action); + self.trigger('pager_action',self.on_pager_action(action)); }); this.do_update_pager(); }, @@ -3372,9 +3372,8 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ controller.on_record_loaded.add_last(function() { once.resolve(); }); - controller.on_pager_action.add_first(function() { - self.save_any_view(); - }); + controller.on('pager_action',self,self.save_any_view); + } else if (view_type == "graph") { self.reload_current_view() } From 833c7bdc521783aac25efe63b7f59bed65be7570 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Fri, 12 Oct 2012 11:50:04 +0530 Subject: [PATCH 2/3] [FIX]Change name of the event and 'on_pager_action' function bzr revid: vja@tinyerp.com-20121012062004-2an59ci8z5o9ijpu --- addons/web/static/src/js/view_form.js | 9 +++++---- addons/web_diagram/static/src/js/diagram.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a648bbe10e9..75ab275d80b 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -431,8 +431,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM do_notify_change: function() { this.$el.add(this.$buttons).addClass('oe_form_dirty'); }, - on_pager_action: function(action) { + execute_pager_action: function(action) { if (this.can_be_discarded()) { + this.trigger('pager_action_executed'); switch (action) { case 'first': this.dataset.index = 0; @@ -464,7 +465,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM } this.$pager.on('click','a[data-pager-action]',function() { var action = $(this).data('pager-action'); - self.trigger('pager_action',self.on_pager_action(action)); + self.execute_pager_action(action); }); this.do_update_pager(); }, @@ -799,7 +800,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM $.when(this.has_been_loaded).then(function() { if (self.datarecord.id && confirm(_t("Do you really want to delete this record?"))) { self.dataset.unlink([self.datarecord.id]).then(function() { - self.on_pager_action('next'); + self.execute_pager_action('next'); def.resolve(); }); } else { @@ -3387,7 +3388,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ controller.on("load_record", self, function(){ once.resolve(); }); - controller.on('pager_action',self,self.save_any_view); + controller.on('pager_action_executed',self,self.save_any_view); } else if (view_type == "graph") { self.reload_current_view() } diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index 9fd74853c3c..f9a6bac812f 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -57,7 +57,7 @@ instance.web.DiagramView = instance.web.View.extend({ this.$el.find('div.oe_diagram_pager button[data-pager-action]').click(function() { var action = $(this).data('pager-action'); - self.on_pager_action(action); + self.execute_pager_action(action); }); this.do_update_pager(); From 31a42989a7e35641d4241c3c88e846c8d71dcfa5 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Fri, 12 Oct 2012 14:19:00 +0530 Subject: [PATCH 3/3] [IMP]Improve Code bzr revid: vja@tinyerp.com-20121012084900-zja87nszeh3q1ree --- addons/web/static/src/js/view_form.js | 2 +- addons/web_diagram/static/src/js/diagram.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 75ab275d80b..55b5434d1c5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -433,7 +433,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM }, execute_pager_action: function(action) { if (this.can_be_discarded()) { - this.trigger('pager_action_executed'); switch (action) { case 'first': this.dataset.index = 0; @@ -449,6 +448,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM break; } this.reload(); + this.trigger('pager_action_executed'); } }, init_pager: function() { diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index f9a6bac812f..572a91c019e 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -348,7 +348,7 @@ instance.web.DiagramView = instance.web.View.extend({ }); }, - on_pager_action: function(action) { + execute_pager_action: function(action) { switch (action) { case 'first': this.dataset.index = 0; @@ -381,7 +381,7 @@ instance.web.DiagramView = instance.web.View.extend({ do_show: function() { this.do_push_state({}); - return $.when(this._super(), this.on_pager_action('reload')); + return $.when(this._super(), this.execute_pager_action('reload')); } }); };