From 32441da020525552abe2c07a3dfa475e7a769c19 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Fri, 2 Sep 2011 17:59:49 +0200 Subject: [PATCH] [fix] fix in the model helper bzr revid: nicolas.vanhoren@openerp.com-20110902155949-29mhv0d8rnl0dzkt --- addons/web/controllers/main.py | 6 +++--- addons/web/static/src/js/data.js | 2 +- 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) {