From d1a5c72972b056212053a0a8ee580afcffc0e30f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 10 Aug 2011 12:38:36 +0200
Subject: [PATCH] [FIX] Fixed remaining references to session.action_manager

bzr revid: fme@openerp.com-20110810103836-li6e7kx8tdk52iil
---
 addons/base/static/src/js/form.js                | 3 +--
 addons/base/static/src/js/list.js                | 9 ++++-----
 addons/base/static/src/js/view_tree.js           | 2 +-
 addons/base/static/src/js/views.js               | 3 +--
 addons/base_dashboard/static/src/js/dashboard.js | 1 -
 addons/base_graph/static/src/js/graph.js         | 2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js
index e488bb3dfa1..b6ce4b10bfb 100644
--- a/addons/base/static/src/js/form.js
+++ b/addons/base/static/src/js/form.js
@@ -767,8 +767,7 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({
         var self = this;
 
         this.view.execute_action(
-            this.node.attrs, this.view.dataset, this.session.action_manager,
-            this.view.datarecord.id, function () {
+            this.node.attrs, this.view.dataset, this.view.datarecord.id, function () {
                 self.view.reload();
             });
     }
diff --git a/addons/base/static/src/js/list.js b/addons/base/static/src/js/list.js
index 11440a003b5..54612b360d4 100644
--- a/addons/base/static/src/js/list.js
+++ b/addons/base/static/src/js/list.js
@@ -460,11 +460,10 @@ openerp.base.ListView = openerp.base.View.extend( /** @lends openerp.base.ListVi
             return field.name === name;
         });
         if (!action) { return; }
-        this.execute_action(
-            action, this.dataset, this.session.action_manager, id, function () {
-                $.when(callback.apply(this, arguments).then(function () {
-                    self.compute_aggregates();
-                }));
+        this.execute_action(action, this.dataset, id, function () {
+            $.when(callback.apply(this, arguments).then(function () {
+                self.compute_aggregates();
+            }));
         });
     },
     /**
diff --git a/addons/base/static/src/js/view_tree.js b/addons/base/static/src/js/view_tree.js
index 05f58c077ff..9951d9429f8 100644
--- a/addons/base/static/src/js/view_tree.js
+++ b/addons/base/static/src/js/view_tree.js
@@ -177,7 +177,7 @@ openerp.base.TreeView = openerp.base.View.extend({
             if (!actions.length) { return; }
             var action = actions[0][2];
             action.flags.new_window = true;
-            self.session.action_manager.do_action(action);
+            self.do_action(action);
         });
     },
 
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index f3e0bf2fc64..dd81d87cd40 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -476,11 +476,10 @@ openerp.base.View = openerp.base.Widget.extend({
      * @param {String} [action_data.type='workflow'] the action type, if present, one of ``'object'``, ``'action'`` or ``'workflow'``
      * @param {Object} [action_data.context=null] additional action context, to add to the current context
      * @param {openerp.base.DataSet} dataset a dataset object used to communicate with the server
-     * @param {openerp.base.ActionManager} action_manager object able to actually execute the action, if any is fetched
      * @param {Object} [record_id] the identifier of the object on which the action is to be applied
      * @param {Function} on_closed callback to execute when dialog is closed or when the action does not generate any result (no new action)
      */
-    execute_action: function (action_data, dataset, action_manager, record_id, on_closed) {
+    execute_action: function (action_data, dataset, record_id, on_closed) {
         var self = this;
         var handler = function (r) {
             var action = r.result;
diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js
index d03923b19e4..b4e04dbd22a 100644
--- a/addons/base_dashboard/static/src/js/dashboard.js
+++ b/addons/base_dashboard/static/src/js/dashboard.js
@@ -333,7 +333,6 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({
                         type: 'object',
                         name: 'action_launch'
                     }, self.dataset,
-                    self.session.action_manager,
                     $(this).data('id'), function () {
                         // after action popup closed, refresh configuration
                         // thingie
diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js
index 25ce024638b..5ad85e4a8b0 100644
--- a/addons/base_graph/static/src/js/graph.js
+++ b/addons/base_graph/static/src/js/graph.js
@@ -442,7 +442,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({
             }
             views.push(view);
         });
-        this.session.action_manager.do_action({
+        this.do_action({
             "res_model" : this.dataset.model,
             "domain" : this.dataset.domain,
             "views" : views,