odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Add to dashboard domain & context merging problems 

bzr revid: fme@openerp.com-20120307160503-w1mha79xiznl4x6h
This commit is contained in:
Fabien Meghazi 2012-03-07 17:05:03 +01:00
parent db24973abe
commit c0439810ef
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/web/controllers/main.py
View File

@ -1344,6 +1344,7 @@ class SearchView(View):
ctx = common.nonliterals.CompoundContext(context_to_save)
ctx.session = req.session
ctx = ctx.evaluate()
ctx['dashboard_merge_domains_contexts'] = False # TODO: replace this 6.1 workaround by attribute on <action/>
domain = common.nonliterals.CompoundDomain(domain)
domain.session = req.session
domain = domain.evaluate()

19
addons/web_dashboard/static/src/js/dashboard.js
View File

@ -145,13 +145,20 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
action = result.result,
view_mode = action_attrs.view_mode;
if (action_attrs.context) {
action.context = _.extend((action.context || {}), action_attrs.context);
}
if (action_attrs.domain) {
action.domain = action.domain || [];
action.domain.unshift.apply(action.domain, action_attrs.domain);
if (action_attrs.context && action_attrs.context['dashboard_merge_domains_contexts'] === false) {
// TODO: replace this 6.1 workaround by attribute on <action/>
action.context = action_attrs.context || {};
action.domain = action_attrs.domain || [];
} else {
if (action_attrs.context) {
action.context = _.extend((action.context || {}), action_attrs.context);
}
if (action_attrs.domain) {
action.domain = action.domain || [];
action.domain.unshift.apply(action.domain, action_attrs.domain);
}
}
var action_orig = _.extend({ flags : {} }, action);
if (view_mode && view_mode != action.view_mode) {