From 833c7bdc521783aac25efe63b7f59bed65be7570 Mon Sep 17 00:00:00 2001 From: Vishmita Date: Fri, 12 Oct 2012 11:50:04 +0530 Subject: [PATCH] [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();