odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Strip whitespace for jsonified fvg.arch 

bzr revid: fme@openerp.com-20121204170230-k074c181dt0x920f
This commit is contained in:
Fabien Meghazi 2012-12-04 18:02:30 +01:00
parent 58b44d5082
commit c867595eed
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/web/static/src/js/views.js
View File

@ -1398,7 +1398,7 @@ instance.web.fields_view_get = function(args) {
function postprocess(fvg) {
fvg.arch_string = fvg.arch;
fvg.arch_doc = $.parseXML(fvg.arch);
fvg.arch = instance.web.xml_to_json(fvg.arch_doc);
fvg.arch = instance.web.xml_to_json(fvg.arch_doc, true);
if ('id' in fvg.fields) {
// Special case for id's
var id_field = fvg.fields['id'];
@ -1424,14 +1424,13 @@ instance.web.fields_view_get = function(args) {
});
};
instance.web.xml_to_json = function(node) {
instance.web.xml_to_json = function(node, strip_whitespace) {
switch (node.nodeType) {
case 9:
return instance.web.xml_to_json(node.documentElement);
return instance.web.xml_to_json(node.documentElement, strip_whitespace);
case 3:
case 4:
return node.data;
break;
return (strip_whitespace && node.data.trim() === '') ? undefined : node.data;
case 1:
var attrs = $(node).getAttributes();
_.each(['domain', 'filter_domain', 'context', 'default_get'], function(key) {
@ -1444,7 +1443,9 @@ instance.web.xml_to_json = function(node) {
return {
tag: node.tagName.toLowerCase(),
attrs: attrs,
children: _.map(node.childNodes, instance.web.xml_to_json)
children: _.compact(_.map(node.childNodes, function(node) {
return instance.web.xml_to_json(node, strip_whitespace);
})),
}
}
}