pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] In dashboard, custom context and domains should override the action's context and domain instead of merging them

Browse Source 
bzr revid: fme@openerp.com-20111205120058-top4labz244r5tat
This commit is contained in:
Fabien Meghazi
2011-12-05 13:00:58 +01:00
parent 7f1e33e16f
commit 758260b6bb
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_dashboard/static/src/js/dashboard.js
+2 -4
View File
@@ -148,13 +148,11 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
action_attrs = this.actions_attrs[action.id],
view_mode = action_attrs.view_mode;
// TODO: Use xmo's python evaluator when ready
if (action_attrs.context) {
action.context = _.extend(action.context || {}, action_attrs.context);
action.context = action_attrs.context;
}
if (action_attrs.domain) {
action.domain = action.domain || [];
action.domain.push.apply(action.domain, action_attrs.domain);
action.domain = action_attrs.domain;
}
var action_orig = _.extend({}, action);