From 13cf80a229079495ecb748431b34faff8f9cd114 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 13 Jul 2011 12:43:51 +0200 Subject: [PATCH] [IMP] graph&dashboard: do not instantiate ActionManager directly anymore bzr revid: fme@openerp.com-20110713104351-wy7dwm2v8ywsz2tf --- addons/base_dashboard/static/src/js/dashboard.js | 4 +--- addons/base_graph/static/src/js/graph.js | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js index 1e0a8d22a80..1c30b1541ed 100644 --- a/addons/base_dashboard/static/src/js/dashboard.js +++ b/addons/base_dashboard/static/src/js/dashboard.js @@ -71,7 +71,6 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ // TODO: create a Dialog controller which optionally takes an action // Should set width & height automatically and take buttons & views callback var dialog_id = _.uniqueId('act_window_dialog'); - var action_manager = new openerp.base.ActionManager(this.session, dialog_id); var $dialog = $('
').dialog({ modal : true, title : 'Actions', @@ -87,8 +86,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ } } }); - action_manager.start(); - action_manager.do_action(action); + new openerp.base.ViewManagerAction(this.session, dialog_id, action).start(); // TODO: should bind ListView#select_record in order to catch record clicking }, do_add_widget : function(action_manager) { diff --git a/addons/base_graph/static/src/js/graph.js b/addons/base_graph/static/src/js/graph.js index 6f1e3a89253..fdf3585449c 100644 --- a/addons/base_graph/static/src/js/graph.js +++ b/addons/base_graph/static/src/js/graph.js @@ -434,9 +434,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({ } views.push(view); }); - this.actionmanager = new openerp.base.ActionManager(this.session, "oe_app"); - this.actionmanager.start(); - this.actionmanager.do_action({ + this.session.action_manager.do_action({ "res_model" : this.dataset.model, "domain" : this.dataset.domain, "views" : views,