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

[FIX] Also apply @context and @domain to original action of dashboards 

bzr revid: fme@openerp.com-20111117164955-kdrptke0zoqlwtgp
This commit is contained in:
Fabien Meghazi 2011-11-17 17:49:55 +01:00
parent b0cf88ec27
commit 8f0ca443b0
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,10 +219,20 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
},
on_load_action: function(result) {
var self = this,
action_orig = _.extend({}, result.result),
action = result.result,
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);
}
if (action_attrs.domain) {
action.domain = action.domain || [];
action.domain.push.apply(action.domain, action_attrs.domain);
}
var action_orig = _.extend({}, action);
if (view_mode && view_mode != action.view_mode) {
var action_view_mode = action.view_mode.split(',');
action.views = _.map(view_mode.split(','), function(mode) {
@ -237,15 +247,6 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
});
}
// TODO: Use xmo's python evaluator when ready
if (action_attrs.context) {
action.context = _.extend(action.context || {}, action_attrs.context);
}
if (action_attrs.domain) {
action.domain = action.domain || [];
action.domain.push.apply(action.domain, action_attrs.domain);
}
action.flags = {
search_view : false,
sidebar : false,