diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-11-22 13:41:30 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-11-22 13:41:30 +0100 |
| commit | 9105afcd68643c97235a87058d576ebdd10cad4b (patch) | |
| tree | 5e5fa0f5c05b3e55bfc2ae04b511e92452ce4b47 /addons/web/static/src/js/pyeval.js | |
| parent | 3909d1ff0218203755f554eba8ee2a86dbd1405c (diff) | |
[FIX] put evaluation context in evaluation context
so you can access the context while you're accessing the context
bzr revid: xmo@openerp.com-20121122124130-t8j6sggtnl4f0b8r
Diffstat (limited to 'addons/web/static/src/js/pyeval.js')
| -rw-r--r-- | addons/web/static/src/js/pyeval.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js index ca4d5a0a1e7..fe68d5652a5 100644 --- a/addons/web/static/src/js/pyeval.js +++ b/addons/web/static/src/js/pyeval.js @@ -2,7 +2,6 @@ * py.js helpers and setup */ openerp.web.pyeval = function (instance) { - var _t = instance.web._t; instance.web.pyeval = {}; var obj = function () {}; @@ -226,6 +225,7 @@ openerp.web.pyeval = function (instance) { var evaluated = ctx; switch(ctx.__ref) { case 'context': + evaluation_context.context = py.dict.fromJSON(evaluation_context); evaluated = py.eval(ctx.__debug, evaluation_context); break; case 'compound_context': @@ -245,6 +245,7 @@ openerp.web.pyeval = function (instance) { _(domains).each(function (domain) { switch(domain.__ref) { case 'domain': + evaluation_context.context = py.dict.fromJSON(evaluation_context); result_domain.push.apply( result_domain, py.eval(domain.__debug, evaluation_context)); break; @@ -268,6 +269,7 @@ openerp.web.pyeval = function (instance) { var evaluated = ctx; switch(ctx.__ref) { case 'context': + evaluation_context.context = py.dict.fromJSON(evaluation_context); evaluated = py.eval(ctx.__debug, evaluation_context); break; case 'compound_context': @@ -327,7 +329,7 @@ openerp.web.pyeval = function (instance) { case 'context': case 'compound_context': return instance.web.pyeval.eval('contexts', [arg]); default: - throw new Error(_t("Unknown nonliteral type " + arg.__ref)); + throw new Error(instance.web._t("Unknown nonliteral type " + arg.__ref)); } }; /** @@ -362,11 +364,11 @@ openerp.web.pyeval = function (instance) { } catch (e) { d.resolve({ error: { code: 400, - message: _t("Evaluation Error"), + message: instance.web._t("Evaluation Error"), data: { type: 'local_exception', debug: _.str.sprintf( - _t("Local evaluation failure\n%s\n\n%s"), + instance.web._t("Local evaluation failure\n%s\n\n%s"), e.message, JSON.stringify(source)) } }}); |