diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index cc8b596e6f5..2cdeb9e89d5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1315,3 +1315,6 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after { border-color: rgba(0,0,0,0); border-left-color: #CFCCCC; } +.openerp .view_editor{ + border-bottom: 1px solid #CFCCCC; +} diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index c2d8404a2dd..28b13aa1930 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -44,8 +44,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }, "Edit": function(){ - self.xml_id=0; - self.edit_view(); + self.xml_id = 0 ; + self.get_data(); + }, "Close": function(){ $(this).dialog('destroy'); @@ -58,10 +59,12 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ action_manager.appendTo(this.dialog); action_manager.do_action(action); }, - check_attr:function(xml,tag){ + + check_attr:function(xml,tag,level){ var obj = new Object(); obj.child_id = []; obj.id = this.xml_id++; + obj.level = level; var att_list = []; var name1 = "<" + tag; $(xml).each(function() { @@ -75,6 +78,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ obj.name = name1; return obj; }, + save_object : function(val,parent_list,child_obj_list){ var self = this; var check_id = parent_list[0]; @@ -94,14 +98,16 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ val.child_id = child_obj_list; } }, + children_function : function(xml,root,parent_list,parent_id,main_object){ var self = this; var child_obj_list = []; var parent_list = parent_list; var main_object = main_object; var children_list = $(xml).filter(root).children(); + var parents = $(children_list[0]).parents().get(); _.each(children_list, function(child_node){ - var string = self.check_attr(child_node,child_node.tagName.toLowerCase()); + var string = self.check_attr(child_node,child_node.tagName.toLowerCase(),parents.length); child_obj_list.push(string); }); if(children_list.length != 0){ @@ -115,42 +121,47 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } for(var i=0;i + + + +
+
+ + + + + + + + + + + + + + + + Export @@ -1295,6 +1317,7 @@ +