[REM] server-side eval_domain_and_context

bzr revid: xmo@openerp.com-20121123113932-siz0u2vp2u7z6wk2

1 files changed, 4 insertions, 4 deletions

diff --git a/addons/web/static/src/js/pyeval.js b/addons/web/static/src/js/pyeval.js
index d00654fc8ef..e16880889d2 100644
--- a/addons/web/static/src/js/pyeval.js
+++ b/addons/web/static/src/js/pyeval.js
@@ -739,13 +739,13 @@ openerp.web.pyeval = function (instance) {
     instance.web.pyeval.eval_domains_and_contexts = function (source) {
         return new $.Deferred(function (d) {setTimeout(function () {
             try {
-                var contexts = ([instance.session.context] || []).concat(source.contexts);
+                var contexts = ([instance.session.user_context] || []).concat(source.contexts);
                 // see Session.eval_context in Python
-                d.resolve({result: {
+                d.resolve({
                     context: instance.web.pyeval.eval('contexts', contexts),
                     domain: instance.web.pyeval.eval('domains', source.domains),
-                    group_by: instance.web.pyeval.eval('groupbys', source.group_by_seq)
-                }}, 'success', {});
+                    group_by: instance.web.pyeval.eval('groupbys', source.group_by_seq || [])
+                });
             } catch (e) {
                 d.resolve({ error: {
                     code: 400,