Merge lp:~openerp-dev/openerp-web/7.0-fix-xml-chm into lp:openerp-web/7.0

[Christophe Matthieu (OpenERP)]

[lp:~openerp-dev/openerp-web/7.0-fix-xml-chm]

3666. By Christophe Matthieu (OpenERP) on 2012-12-27

[FIX] web form: get iterator with dom for load the good json attribute

[Christophe Matthieu (OpenERP) (chm-openerp)]

[FIX] web view & web form:
Fix the loader of xml attributes for IE (set json value before add to the dom)
Now all attributes are allowed (style, color...)

Unmerged revisions

3666. By Christophe Matthieu (OpenERP) on 2012-12-27

[FIX] web form: get iterator with dom for load the good json attribute

3665. By Christophe Matthieu (OpenERP) on 2012-12-27

[FIX] web view & web form: fix the load of the xml attributes for IE; now all attributes are allowed (like style, color...)

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2012-12-26 16:13:07 +0000
+++ addons/web/static/src/js/view_form.js	2012-12-27 13:44:23 +0000
@@ -1191,19 +1191,19 @@
             });
         }
     },
-    get_arch_fragment: function() {
+    set_arch_fragment: function() {
         var doc = $.parseXML(instance.web.json_node_to_xml(this.fvg.arch)).documentElement;
+        this.json = instance.web.xml_to_json(doc);
         // IE won't allow custom button@type and will revert it to spec default : 'submit'
         $('button', doc).each(function() {
             $(this).attr('data-button-type', $(this).attr('type')).attr('type', 'button');
         });
-        return $('<div class="oe_form"/>').append(instance.web.xml_to_str(doc));
+        this.$form = $('<div class="oe_form"/>').append(instance.web.xml_to_str(doc));
     },
     render_to: function($target) {
         var self = this;
         this.$target = $target;
-
-        this.$form = this.get_arch_fragment();
+        this.set_arch_fragment();
 
         this.process_version();
 
@@ -1218,6 +1218,7 @@
         this.to_replace = [];
 
         _.each(this.fields_to_init, function($elem) {
+            var iterator =self.$form.find($elem).index();
             var name = $elem.attr("name");
             if (!self.fvg.fields[name]) {
                 throw new Error(_.str.sprintf(_t("Field '%s' specified in view could not be found."), name));
@@ -1226,7 +1227,7 @@
             if (!obj) {
                 throw new Error(_.str.sprintf(_t("Widget type '%s' is not implemented"), $elem.attr('widget')));
             }
-            var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
+            var w = new (obj)(self.view, self.json.children[iterator]);
             var $label = self.labels[$elem.attr("name")];
             if ($label) {
                 w.set_input_id($label.attr("for"));
@@ -1236,15 +1237,17 @@
             self.to_replace.push([w, $elem]);
         });
         _.each(this.tags_to_init, function($elem) {
+            var iterator =self.$form.find($elem).index();
             var tag_name = $elem[0].tagName.toLowerCase();
             var obj = self.tags_registry.get_object(tag_name);
-            var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
+            var w = new (obj)(self.view, self.json.children[iterator]);
             self.to_replace.push([w, $elem]);
         });
         _.each(this.widgets_to_init, function($elem) {
+            var iterator =self.$form.find($elem).index();
             var widget_type = $elem.attr("type");
             var obj = self.widgets_registry.get_object(widget_type);
-            var w = new (obj)(self.view, instance.web.xml_to_json($elem[0]));
+            var w = new (obj)(self.view, self.json.children[iterator]);
             self.to_replace.push([w, $elem]);
         });
     },
 
=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2012-12-21 11:36:57 +0000
+++ addons/web/static/src/js/views.js	2012-12-27 13:44:23 +0000
@@ -1435,7 +1435,10 @@
         case 4:
             return (strip_whitespace && node.data.trim() === '') ? undefined : node.data;
         case 1:
-            var attrs = $(node).getAttributes();
+            var attrs = {};
+            _.each(node.attributes, function(attr) {
+                attrs[attr.name] = attr.value;
+            });
             _.each(['domain', 'filter_domain', 'context', 'default_get'], function(key) {
                 if (attrs[key]) {
                     try {