diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 6f289612099..535ab7d9fea 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1331,9 +1331,10 @@ class SearchView(View): @openerpweb.jsonrequest def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''): - ctx = common.nonliterals.CompoundContext(context_to_save) - ctx.session = req.session - ctx = ctx.evaluate() + to_eval = common.nonliterals.CompoundContext(context_to_save) + to_eval.session = req.session + ctx = dict((k, v) for k, v in to_eval.evaluate().iteritems() + if not k.startswith('search_default_')) ctx['dashboard_merge_domains_contexts'] = False # TODO: replace this 6.1 workaround by attribute on domain = common.nonliterals.CompoundDomain(domain) domain.session = req.session diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 9a2e071f344..b8c22f92e9e 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -305,8 +305,8 @@ openerp.web.SearchView = openerp.web.OldWidget.extend(/** @lends openerp.web.Sea var menu_id = $(this).find("select").val(), title = $(this).find("input").val(), data = self.build_search_data(), - context = new openerp.web.CompoundContext(), - domain = new openerp.web.CompoundDomain(); + context = new openerp.web.CompoundContext(self.dataset.get_context()), + domain = new openerp.web.CompoundDomain(self.dataset.get_domain()); _.each(data.contexts, function(x) { context.add(x); });