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:
9a4784f
)
[FIX] views: when loading an action, the active_* parameters should overwrite previou...
author
Martin Trigaux
<mat@openerp.com>
Fri, 4 Jul 2014 10:20:51 +0000
(12:20 +0200)
committer
Martin Trigaux
<mat@openerp.com>
Fri, 4 Jul 2014 10:20:51 +0000
(12:20 +0200)
addons/web/static/src/js/views.js
patch
|
blob
|
history
diff --git
a/addons/web/static/src/js/views.js
b/addons/web/static/src/js/views.js
index
7b7da1d
..
1c563d1
100644
(file)
--- a/
addons/web/static/src/js/views.js
+++ b/
addons/web/static/src/js/views.js
@@
-1462,7
+1462,7
@@
instance.web.View = instance.web.Widget.extend({
} else if (action_data.type=="action") {
return this.rpc('/web/action/load', {
action_id: action_data.name,
- context: _.extend({'active_model': dataset.model, 'active_ids': dataset.ids, 'active_id': record_id}, instance.web.pyeval.eval('context', context)),
+ context: _.extend(instance.web.pyeval.eval('context', context), {'active_model': dataset.model, 'active_ids': dataset.ids, 'active_id': record_id}),
do_not_eval: true
}).then(handler);
} else {