summaryrefslogtreecommitdiff
path: root/addons/web
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2011-09-02 17:59:49 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2011-09-02 17:59:49 +0200
commit32441da020525552abe2c07a3dfa475e7a769c19 (patch)
treec67acda02cca3f65581d298492938178e3ad95b4 /addons/web
parentae91f6400b6a37c3e33c1e0179431198fa9737f1 (diff)
[fix] fix in the model helper
bzr revid: nicolas.vanhoren@openerp.com-20110902155949-29mhv0d8rnl0dzkt
Diffstat (limited to 'addons/web')
-rw-r--r--addons/web/controllers/main.py6
-rw-r--r--addons/web/static/src/js/data.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index e950c174b7e..57665a32440 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -700,12 +700,12 @@ class DataSet(openerpweb.Controller):
args[domain_id] = d
if context_id and len(args) - 1 >= context_id:
args[context_id] = c
-
+
for i in xrange(len(args)):
if isinstance(args[i], base.common.nonliterals.BaseContext):
- args[i] = session.eval_context(args[i])
+ args[i] = req.session.eval_context(args[i])
if isinstance(args[i], base.common.nonliterals.BaseDomain):
- args[i] = session.eval_domain(args[i])
+ args[i] = req.session.eval_domain(args[i])
return getattr(req.session.model(model), method)(*args)
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js
index 55e407c99cd..3a997d4f003 100644
--- a/addons/web/static/src/js/data.js
+++ b/addons/web/static/src/js/data.js
@@ -747,7 +747,7 @@ openerp.base.Model = openerp.base.SessionAware.extend({
return function() {
if (method_name == "search_read")
return self._search_read.apply(self, arguments);
- return self._call(method_name, arguments);
+ return self._call(method_name, _.toArray(arguments));
};
},
_call: function (method, args) {