[IMP]Improve Code
authorVishmita <vja@tinyerp.com>
Fri, 12 Oct 2012 08:49:00 +0000 (14:19 +0530)
committerVishmita <vja@tinyerp.com>
Fri, 12 Oct 2012 08:49:00 +0000 (14:19 +0530)
bzr revid: vja@tinyerp.com-20121012084900-zja87nszeh3q1ree

addons/web/static/src/js/view_form.js
addons/web_diagram/static/src/js/diagram.js

index 75ab275..55b5434 100644 (file)
@@ -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() {
index f9a6bac..572a91c 100644 (file)
@@ -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'));
     }
 });
 };