[REM] python-side evaluations of contexts and domains in dashboard controller

bzr revid: xmo@openerp.com-20121126140423-waptfrxe4gbidpnv

1 files changed, 13 insertions, 2 deletions

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index eb835c43e22..13a51cc663e 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -375,11 +375,22 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         var domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []);
         _.each(data.contexts, context.add, context);
         _.each(data.domains, domain.add, domain);
+
+        var c = instance.web.pyeval.eval('context', context);
+        for(var k in c) {
+            if (c.hasOwnProperty(k) && /^search_default_/.test(k)) {
+                delete c[k];
+            }
+        }
+        // TODO: replace this 6.1 workaround by attribute on <action/>
+        c.dashboard_merge_domains_contexts = false;
+        var d = instance.web.pyeval.eval('domain', domain);
+
         this.rpc('/board/add_to_dashboard', {
             menu_id: this.$el.find("select").val(),
             action_id: view_parent.action.id,
-            context_to_save: context,
-            domain: domain,
+            context_to_save: c,
+            domain: d,
             view_mode: view_parent.active_view,
             name: this.$el.find("input").val()
         }).done(function(r) {