From 2d3a70230834b129da9870163b5a991cda392d65 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 14 Dec 2011 12:28:14 +0100 Subject: [PATCH] [FIX] Dashboard: merge domain & context of board action to loaded action bzr revid: fme@openerp.com-20111214112814-sogxz3no8wh0fbai --- addons/web_dashboard/static/src/js/dashboard.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index b70217a1021..ce7e877b73f 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -149,10 +149,11 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ view_mode = action_attrs.view_mode; if (action_attrs.context) { - action.context = action_attrs.context; + action.context = _.extend((action.context || {}), action_attrs.context); } if (action_attrs.domain) { - action.domain = action_attrs.domain; + action.domain = action.domain || []; + action.domain.unshift.apply(action.domain, action_attrs.domain); } var action_orig = _.extend({ flags : {} }, action);