From 758260b6bb0eb271e115597220d5b36b1c8f1538 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 5 Dec 2011 13:00:58 +0100 Subject: [PATCH] [IMP] In dashboard, custom context and domains should override the action's context and domain instead of merging them bzr revid: fme@openerp.com-20111205120058-top4labz244r5tat --- addons/web_dashboard/static/src/js/dashboard.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index ff2783cdcaf..f5adf6ec406 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -148,13 +148,11 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ action_attrs = this.actions_attrs[action.id], view_mode = action_attrs.view_mode; - // TODO: Use xmo's python evaluator when ready if (action_attrs.context) { - action.context = _.extend(action.context || {}, action_attrs.context); + action.context = action_attrs.context; } if (action_attrs.domain) { - action.domain = action.domain || []; - action.domain.push.apply(action.domain, action_attrs.domain); + action.domain = action_attrs.domain; } var action_orig = _.extend({}, action);