[FIX] Preserve kanban views whitespaces

bzr revid: fme@openerp.com-20111130123154-nhh6sj21s38ejsb5

addons/web/common/xml2json.py

@@ -31,7 +31,7 @@ class Xml2Json(object):
         if el.text and (not skip_whitespaces or el.text.strip() != ''):
             kids.append(el.text)
         for kid in el:
-            kids.append(Xml2Json.convert_element(kid))
+            kids.append(Xml2Json.convert_element(kid, skip_whitespaces))
             if kid.tail and (not skip_whitespaces or kid.tail.strip() != ''):
                 kids.append(kid.tail)
         res["children"] = kids

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)
+        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):
+    def process_view(self, session, fvg, context, transform, skip_whitespaces=True):
         # 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)
+        fvg['arch'] = web.common.xml2json.Xml2Json.convert_element(xml, skip_whitespaces)
 
         for field in fvg['fields'].itervalues():
             if field.get('views'):