From b49b1cfb104e85922666ccd567a4fa8d131a83be Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 11 Oct 2011 17:59:50 +0200 Subject: [PATCH] [IMP] Dashboard: use parent's do_action bzr revid: fme@openerp.com-20111011155950-z620hv2zxtccm501 --- .../web_dashboard/static/src/js/dashboard.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index adcf91fd06c..24b3a2339fd 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -214,6 +214,8 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ }); }, on_load_action: function(result) { + var self = this; + var action_orig = _.extend({}, result.result); var action = result.result; action.flags = { search_view : false, @@ -228,6 +230,14 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ this.action_managers.push(am); am.appendTo($("#"+this.view.element_id + '_action_' + action.id)); am.do_action(action); + am.do_action = function(action) { + self.do_action(action); + } + if (am.inner_viewmanager) { + am.inner_viewmanager.on_mode_switch.add(function(mode) { + self.do_action(action_orig); + }); + } }, render: function() { // We should start with three columns available @@ -241,12 +251,10 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ return QWeb.render(this.template, this); }, do_reload: function() { - _.each(this.action_managers, function(am) { - am.stop(); - }); - this.action_managers = []; + var view_manager = this.view.widget_parent, + action_manager = view_manager.widget_parent; this.view.stop(); - this.view.start(); + action_manager.do_action(view_manager.action); } }); openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({