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

[FIX] context evaluation: accumulation of literal and compound context data into evaluated context 

bzr revid: xmo@openerp.com-20120307074641-pm5wl9t3cb4l9s64
This commit is contained in:
Xavier Morel 2012-03-07 08:46:41 +01:00
parent 96a5947f75
commit 98341230a7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/web/static/src/js/core.js
View File

@ -514,10 +514,11 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
_(contexts).each(function (ctx) {
switch(ctx.__ref) {
case 'context':
_.extend(py.eval(ctx.__debug));
_.extend(result_context, py.eval(ctx.__debug));
break;
case 'compound_context':
_.extend(self.test_eval_contexts(ctx.__contexts));
_.extend(
result_context, self.test_eval_contexts(ctx.__contexts));
break;
default:
_.extend(result_context, ctx);