projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5fd4033
)
[FIX] Dashboard: merge domain & context of board action to loaded action
author
Fabien Meghazi
<fme@openerp.com>
Wed, 14 Dec 2011 11:28:14 +0000
(12:28 +0100)
committer
Fabien Meghazi
<fme@openerp.com>
Wed, 14 Dec 2011 11:28:14 +0000
(12:28 +0100)
bzr revid: fme@openerp.com-
20111214112814
-sogxz3no8wh0fbai
addons/web_dashboard/static/src/js/dashboard.js
patch
|
blob
|
history
diff --git
a/addons/web_dashboard/static/src/js/dashboard.js
b/addons/web_dashboard/static/src/js/dashboard.js
index
b70217a
..
ce7e877
100644
(file)
--- a/
addons/web_dashboard/static/src/js/dashboard.js
+++ b/
addons/web_dashboard/static/src/js/dashboard.js
@@
-149,10
+149,11
@@
openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
view_mode = action_attrs.view_mode;
if (action_attrs.context) {
- action.context = action_attrs.context;
+ action.context = _.extend((action.context || {}), action_attrs.context);
}
if (action_attrs.domain) {
- action.domain = action_attrs.domain;
+ action.domain = action.domain || [];
+ action.domain.unshift.apply(action.domain, action_attrs.domain);
}
var action_orig = _.extend({ flags : {} }, action);