From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Dec 2011 11:28:14 +0000 (+0100)
Subject: [FIX] Dashboard: merge domain & context of board action to loaded action
X-Git-Tag: 6.1.0-rc1-addons~670
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=2d3a70230834b129da9870163b5a991cda392d65;p=odoo%2Fodoo.git

[FIX] Dashboard: merge domain & context of board action to loaded action

bzr revid: fme@openerp.com-20111214112814-sogxz3no8wh0fbai
---

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index b70217a..ce7e877 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);