From d028da1058337cdc0ba288614f7f02fa31ff484c Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Thu, 2 Jul 2015 14:56:54 +0200 Subject: [PATCH] [FIX] merge action's and action_attrs' domains/contexts --- .../static/src/js/web_dashboard_open_action.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web_dashboard_open_action/static/src/js/web_dashboard_open_action.js b/web_dashboard_open_action/static/src/js/web_dashboard_open_action.js index ab4b0a8c..0a8b9102 100644 --- a/web_dashboard_open_action/static/src/js/web_dashboard_open_action.js +++ b/web_dashboard_open_action/static/src/js/web_dashboard_open_action.js @@ -26,11 +26,12 @@ openerp.web_dashboard_open_action = function(instance) { var self = this, action = _.extend({flags: {}}, result); action.context_string = action_attrs.context; - action.context = instance.web.pyeval.eval( - 'context', action_attrs.context || {}); action.domain_string = action_attrs.domain; + action.context = instance.web.pyeval.eval( + 'contexts', [action.context || {}, action_attrs.context || {}]); action.domain = instance.web.pyeval.eval( - 'domain', action_attrs.domain || [], action_attrs.context); + 'domains', [action_attrs.domain || [], action.domain || []], + action.context); jQuery('#' + this.view.element_id + '_action_' + index) .parent() .find('.oe_web_dashboard_open_action')