diff options
| author | Fabien Meghazi <fme@openerp.com> | 2012-05-09 10:41:39 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2012-05-09 10:41:39 +0200 |
| commit | 104615333c062e96896f3783edea1bb1b441d36c (patch) | |
| tree | f7ba96cc95d0ba1ac1d383db548c4f6266f2e6cc /addons/web/static/src/js/corelib.js | |
| parent | dd47079a116a8f535dd0ca3c27b1357aff033508 (diff) | |
| parent | e4fdf1b061b7cc859e3d257dcab504caf8e8ebf2 (diff) | |
[MERGE] Merge trunk
bzr revid: fme@openerp.com-20120509084139-q0jae332yok87ae1
Diffstat (limited to 'addons/web/static/src/js/corelib.js')
| -rw-r--r-- | addons/web/static/src/js/corelib.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index 465ad2c921b..b30350a9502 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -1046,7 +1046,9 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({ '<li>Source: %(source)s</li>' + '</ul>'; try { - var ctx = this.test_eval_contexts(source.contexts); + // see Session.eval_context in Python + var ctx = this.test_eval_contexts( + ([this.context] || []).concat(source.contexts)); if (!_.isEqual(ctx, expected.context)) { instance.webclient.notification.warn('Context mismatch, report to xmo', _.str.sprintf(match_template, { |