From 55be9c8aa0c678d9adcedd48275d3e293e535203 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 14 Jul 2011 17:36:47 +0200 Subject: [PATCH] [FIX] fields fixer in process_view: contexts should be parsed via parse_context, has_key should not be used, dict.get ~ in + __getitem__ bzr revid: xmo@openerp.com-20110714153647-qilykek2df0uhp3t --- addons/base/controllers/main.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 20419e03d3e..701bb0f1723 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -569,14 +569,15 @@ class View(openerpweb.Controller): else: xml = ElementTree.fromstring(arch) fvg['arch'] = Xml2Json.convert_element(xml) - for field in fvg['fields'].values(): - if field.has_key('views') and field['views']: - for view in field["views"].values(): + + for field in fvg['fields'].itervalues(): + if field.get('views'): + for view in field["views"].itervalues(): self.process_view(session, view, None, transform) if field.get('domain'): field["domain"] = self.parse_domain(field["domain"], session) if field.get('context'): - field["context"] = self.parse_domain(field["context"], session) + field["context"] = self.parse_context(field["context"], session) @openerpweb.jsonrequest def add_custom(self, request, view_id, arch):