From f40d778c2edb0c572b06c57060d8f37cf91b9d86 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 1 Apr 2011 11:48:35 +0200 Subject: [PATCH] [FIX] some domains and contexts have leading or trailing slashes, need to strip them before evaluation bzr revid: xmo@openerp.com-20110401094835-k1w7xlgdcyppt7io --- addons/base/controllers/main.py | 4 ++-- addons/base/test/test_view.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 6e99aed0c36..0258b86e616 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -408,7 +408,7 @@ class View(openerpweb.Controller): :param session: Current OpenERP session :type session: openerpweb.openerpweb.OpenERPSession """ - domain = elem.get(attr_name) + domain = elem.get(attr_name, '').strip() if domain: try: elem.set( @@ -433,7 +433,7 @@ class View(openerpweb.Controller): """ self.parse_domain(elem, 'domain', session) self.parse_domain(elem, 'filter_domain', session) - context_string = elem.get('context') + context_string = elem.get('context', '').strip() if context_string: try: elem.set('context', diff --git a/addons/base/test/test_view.py b/addons/base/test/test_view.py index fa1779665f8..e5c6162dae0 100644 --- a/addons/base/test/test_view.py +++ b/addons/base/test/test_view.py @@ -32,7 +32,7 @@ class ViewTest(unittest2.TestCase): def test_convert_literal_domain(self): e = xml.etree.ElementTree.Element( - 'field', domain="[('somefield', '=', 3)]") + 'field', domain=" [('somefield', '=', 3)] ") self.view.parse_domains_and_contexts(e, None) self.assertEqual( @@ -75,7 +75,7 @@ class ViewTest(unittest2.TestCase): def test_convert_literal_context(self): e = xml.etree.ElementTree.Element( - 'field', context="{'some_prop': 3}") + 'field', context=" {'some_prop': 3} ") self.view.parse_domains_and_contexts(e, None) self.assertEqual(