[ADD] Add action_manager temporary reference to session

bzr revid: fme@openerp.com-20110412140701-4kl7b1juoxdxye6q

2 files changed, 7 insertions, 4 deletions

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index fe33509dc50..c4c55f2728d 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -916,8 +916,8 @@ openerp.base.WebClient = openerp.base.Controller.extend({
         this.notification.notify("OpenERP Client", "The openerp client has been initialized.");
     },
     on_logged: function() {
-        this.action =  new openerp.base.ActionManager(this.session, "oe_app");
-        this.action.start();
+        this.action_manager =  new openerp.base.ActionManager(this.session, "oe_app");
+        this.action_manager.start();
         
         // if using saved actions, load the action and give it to action manager
         var parameters = jQuery.deparam(jQuery.param.querystring());
@@ -925,12 +925,12 @@ openerp.base.WebClient = openerp.base.Controller.extend({
             var key = parseInt(parameters["s_action"]);
             var self = this;
             this.rpc("/base/session/get_session_action", {key:key}, function(action) {
-                self.action.do_action(action);
+                self.action_manager.do_action(action);
             });
         }
     },
     on_menu_action: function(action) {
-        this.action.do_action(action);
+        this.action_manager.do_action(action);
     },
     do_about: function() {
     }
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 5ec7906394e..abd2efa3aa1 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -9,6 +9,9 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
     init: function(session, element_id) {
         this._super(session, element_id);
         this.viewmanager = null;
+        // Temporary linking view_manager to session.
+        // Will use controller_parent to find it when implementation will be done.
+        session.view_manager = this;
     },
     /**
      * Process an action