Merge lp:~openerp-dev/openerp-web/7.0-opw-590268-msh into lp:openerp-web/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of view_editor, it throws error if there is data tag added in view and when you edit the field.

Demo:- Start Debug moce, Settings -> Technical -> Configuration Wizards -> Launch Configure Accounting Data wizard and then open Manage view -> Edit that view and change field detail and update, you will face error, reason is that in load_xml document object passed instead of string, so converted dom object to string and then passed.

Thanks.

[Mohammed Shekha(Open ERP) (msh-openerp)]

Hello,

It has already been merged in with revision 3858.

Thanks.

=== modified file 'addons/web_view_editor/static/src/js/view_editor.js'
--- addons/web_view_editor/static/src/js/view_editor.js	2012-11-29 14:01:09 +0000
+++ addons/web_view_editor/static/src/js/view_editor.js	2013-03-21 13:39:21 +0000
@@ -642,6 +642,9 @@
                     insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
                 if (insert.length == _.uniq(check_list).length ) {return xml_child;}
             });
+            if (typeof arch.arch != "string"){
+                arch.arch = QWeb.tools.xml_node_to_string(arch.arch);
+            }
             xml_arch = QWeb.load_xml(arch.arch);
         }
         return self.do_save_xml(xml_arch.documentElement, obj[0].child_id[0],obj[0].child_id, move_direct, update_values,arch);