From 7730c14855162bf57b1fd20d4524bf506ab2e8d5 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 28 Sep 2012 12:05:58 +0530
Subject: [PATCH] [IMP]remove callback from call_button and improve related
 code.

bzr revid: vme@tinyerp.com-20120928063558-roez0oayft9l3y4n
---
 addons/web/static/src/js/data.js  | 9 ++++-----
 addons/web/static/src/js/views.js | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 55bc9239536..260f37d24a1 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -708,9 +708,8 @@ instance.web.DataSet =  instance.web.CallbackEnabled.extend({
      * @param {Function} error_callback
      * @returns {$.Deferred}
      */
-    call_button: function (method, args, callback, error_callback) {
-        return this._model.call_button(method, args)
-            .then(callback, error_callback);
+    call_button: function (method, args) {
+        return this._model.call_button(method, args);
     },
     /**
      * Fetches the "readable name" for records, based on intrinsic rules
@@ -1052,7 +1051,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
         }
         return completion.promise();
     },
-    call_button: function (method, args, callback, error_callback) {
+    call_button: function (method, args) {
         var id = args[0][0], index;
         for(var i=0, len=this.cache.length; i<len; ++i) {
             var record = this.cache[i];
@@ -1063,7 +1062,7 @@ instance.web.BufferedDataSet = instance.web.DataSetStatic.extend({
                 break;
             }
         }
-        return this._super(method, args, callback, error_callback);
+        return this._super(method, args);
     },
     alter_ids: function(n_ids) {
         this._super(n_ids);
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index e7748a3b7d4..e3fa4e0e0c6 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -1215,7 +1215,7 @@ instance.web.View = instance.web.Widget.extend({
                 }
             }
             args.push(context);
-            return dataset.call_button(action_data.name, args, handler);
+            return dataset.call_button(action_data.name, args).then(handler(r));
         } else if (action_data.type=="action") {
             return this.rpc('/web/action/load', { action_id: action_data.name, context: context, do_not_eval: true}, handler);
         } else  {