diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-12-01 10:28:23 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-12-01 10:28:23 +0100 |
| commit | ce41e645f7de7e2421a2d8241d79a01a05c2bea2 (patch) | |
| tree | f62b63825f22f7b5cf8bab27daaaf1724a0598c2 /addons/web/controllers/main.py | |
| parent | 740124b5fafb39ece86aed83266f4a0e8b2c5034 (diff) | |
[IMP] Better variable naming in xml2json
bzr revid: fme@openerp.com-20111201092823-mbwyp8tjla9k2xf3
Diffstat (limited to 'addons/web/controllers/main.py')
| -rw-r--r-- | addons/web/controllers/main.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index d337fc240b5..f811f77b34c 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -841,12 +841,12 @@ class View(openerpweb.Controller): context = req.session.eval_context(req.context) fvg = Model.fields_view_get(view_id, view_type, context, toolbar, submenu) # todo fme?: check that we should pass the evaluated context here - self.process_view(req.session, fvg, context, transform, (view_type != 'kanban')) + self.process_view(req.session, fvg, context, transform, (view_type == 'kanban')) if toolbar and transform: self.process_toolbar(req, fvg['toolbar']) return fvg - def process_view(self, session, fvg, context, transform, skip_whitespaces=True): + def process_view(self, session, fvg, context, transform, preserve_whitespaces=False): # depending on how it feels, xmlrpclib.ServerProxy can translate # XML-RPC strings to ``str`` or ``unicode``. ElementTree does not # enjoy unicode strings which can not be trivially converted to @@ -864,7 +864,7 @@ class View(openerpweb.Controller): xml = self.transform_view(arch, session, evaluation_context) else: xml = ElementTree.fromstring(arch) - fvg['arch'] = web.common.xml2json.Xml2Json.convert_element(xml, skip_whitespaces) + fvg['arch'] = web.common.xml2json.Xml2Json.convert_element(xml, preserve_whitespaces) for field in fvg['fields'].itervalues(): if field.get('views'): |