From d558fa620e175dced3ba29f946dda4663aad61fb Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 23 Sep 2011 18:34:06 +0530 Subject: [PATCH 1/7] [IMP]include main xml tag in main_object for up down posisition of node. bzr revid: vme@tinyerp.com-20110923130406-3h1r41v6z768zkqt --- addons/web/static/src/js/view_editor.js | 29 ++++++++++++++++++------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 7f1ac017ff3..824227174ef 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -65,11 +65,14 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ obj.child_id = []; obj.id = this.xml_id++; obj.level = level; + var vidhin = xml; var att_list = []; var name1 = "<" + tag; + var xml_tag = "<" + tag; $(xml).each(function() { att_list = this.attributes; att_list = _.select(att_list, function(attrs){ + xml_tag += ' ' +attrs.nodeName+'='+'"'+attrs.nodeValue+'"'; if (tag != 'button'){ if(attrs.nodeName == "string" || attrs.nodeName == "name" || attrs.nodeName == "index"){ name1 += ' ' +attrs.nodeName+'='+'"'+attrs.nodeValue+'"';} @@ -79,7 +82,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }); name1+= ">"; + xml_tag+= ">"; }); + obj.main_xml = xml_tag; obj.name = name1; return obj; }, @@ -134,17 +139,24 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } return {"main_object":main_object,"parent_child_id":parent_child_id}; }, + parse_xml :function(arch){ + var self = this; + var root = $(arch).filter(":first")[0]; + var tag = root.tagName.toLowerCase(); + var root_object = self.check_attr(root,tag,0); + var one_object = self.children_function(arch,tag,[],0,[root_object],[]); + return self.edit_view(one_object); + }, get_data : function(){ var self = this; var view_id =(($("input[name='radiogroup']:checked").parent()).parent()).attr('data-id'); + dataset = new openerp.web.DataSetSearch(this,'ir.ui.view', null, null); + dataset.read_slice([],{domain : [['inherit_id','=',parseInt(view_id)]]},function (result) { + _.each(result ,function(num){console.log(result);}); + }); var ve_dataset = new openerp.web.DataSet(this,'ir.ui.view'); ve_dataset.read_ids([parseInt(view_id)],['arch'],function (arch){ - var arch = arch[0].arch; - var root = $(arch).filter(":first")[0]; - var tag = root.tagName.toLowerCase(); - var root_object = self.check_attr(root,tag,0); - var one_object = self.children_function(arch,tag,[],0,[root_object],[]); - return self.edit_view(one_object); + self.parse_xml(arch[0].arch); }); }, edit_view : function(one_object){ @@ -197,18 +209,19 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ break; case "side-up": if(side.prev().attr('level') == side.attr('level')){ - console.log(); $(side.prev()).before(side); } break; case "side-down": if(side.next().attr('level') == side.attr('level')){ - var v = side.next().next().attr('level') $(side.next()).after(side); } break; } }); + }, + search_object:function(main_object){ + }, on_expand: function(self){ var level = $(self).closest("tr[id^='viewedit-']").attr('level'); From 145694cc60f0ebe10925f1bfc0baa582e31a78be Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 26 Sep 2011 17:05:01 +0530 Subject: [PATCH 2/7] [IMP]implement code for down image with moving its all children. bzr revid: vme@tinyerp.com-20110926113501-5oed41l0miehjsgx --- addons/web/static/src/js/view_editor.js | 42 ++++++++++++++++++++----- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 824227174ef..a7ceb682a2c 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -198,7 +198,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }); $("img[id^='side-']").click(function() { - var side = $(this).closest("'tr[id^='viewedit-']'"); + var side = $(this).closest("'tr[id^='viewedit-']'") + var id_tr = (side.attr('id')).split('-')[1]; switch (this.id) { case "side-add": @@ -213,15 +214,40 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } break; case "side-down": - if(side.next().attr('level') == side.attr('level')){ - $(side.next()).after(side); + var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); + var level = side.attr('level'); + var list_shift =[]; + var last_tr; + list_shift.push(side); + if(img){ + while(1){ + var next_tr = side.next(); + if(next_tr.attr('level') <= level || next_tr.length==0){ + last_tr = next_tr; + break; + }else{ + list_shift.push(next_tr); + side = next_tr; + } + } + }else{last_tr = side.next();} + var last_tr_id = (last_tr.attr('id')).split('-')[1]; + img = last_tr.find("img[id='parentimg-"+last_tr_id+"']").attr('src'); + if(img){ + while(1){ + var nxt_tr = last_tr.next(); + if (nxt_tr.attr('level') <= level || nxt_tr.length==0){break;} + last_tr = nxt_tr; + } + list_shift.reverse() + } + _.each(list_shift,function(rec){ + $(last_tr).after(rec); + }); break; } }); - }, - search_object:function(main_object){ - }, on_expand: function(self){ var level = $(self).closest("tr[id^='viewedit-']").attr('level'); @@ -231,10 +257,10 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ if (nxt_tr.attr('level') > level){ cur_tr = nxt_tr; nxt_tr.hide(); - }else break; + }else return nxt_tr; } }, - on_collapse: function(self,parent_child_id){ + on_collapse: function(self,parent_child_id,id){ var id = self.id.split('-')[1]; var datas = _.detect(parent_child_id,function(res){ return res.key == id; From bdf4274f2bdf0085ecf7960529959ffa383d7feb Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 27 Sep 2011 10:35:03 +0530 Subject: [PATCH 3/7] [IMP]up-down tag throght image with its all chidren. bzr revid: vme@tinyerp.com-20110927050503-nw9rg581n8im0vwz --- addons/web/static/src/js/view_editor.js | 73 ++++++++++++++++++------- 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index a7ceb682a2c..fd4fcde9ee3 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -152,7 +152,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var view_id =(($("input[name='radiogroup']:checked").parent()).parent()).attr('data-id'); dataset = new openerp.web.DataSetSearch(this,'ir.ui.view', null, null); dataset.read_slice([],{domain : [['inherit_id','=',parseInt(view_id)]]},function (result) { - _.each(result ,function(num){console.log(result);}); + _.each(result ,function(num){ + // todo xpath + }); }); var ve_dataset = new openerp.web.DataSet(this,'ir.ui.view'); ve_dataset.read_ids([parseInt(view_id)],['arch'],function (arch){ @@ -209,42 +211,75 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ case "side-edit": break; case "side-up": - if(side.prev().attr('level') == side.attr('level')){ - $(side.prev()).before(side); - } - break; - case "side-down": - var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); + var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); var level = side.attr('level'); var list_shift =[]; var last_tr; + var next_tr; list_shift.push(side); + var cur_tr = side; + while(1){ + var prev_tr = cur_tr.prev(); + if(level >= prev_tr.attr('level') || prev_tr.length==0){ + last_tr = prev_tr; + break; + } + cur_tr = prev_tr; + } if(img){ while(1){ var next_tr = side.next(); if(next_tr.attr('level') <= level || next_tr.length==0){ - last_tr = next_tr; break; }else{ list_shift.push(next_tr); side = next_tr; } } - }else{last_tr = side.next();} - var last_tr_id = (last_tr.attr('id')).split('-')[1]; - img = last_tr.find("img[id='parentimg-"+last_tr_id+"']").attr('src'); + } + if(last_tr.length!=0 && last_tr.attr('level') == level){ + _.each(list_shift,function(rec){ + $(last_tr).before(rec); + }); + } + break; + case "side-down": + var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); + var level = side.attr('level'); + var list_shift =[]; + var last_tr; + var next_tr; + var cur_tr = side; + list_shift.push(side); if(img){ while(1){ - var nxt_tr = last_tr.next(); - if (nxt_tr.attr('level') <= level || nxt_tr.length==0){break;} - last_tr = nxt_tr; + var next_tr = cur_tr.next(); + if(next_tr.attr('level') <= level || next_tr.length==0){ + last_tr = next_tr; + break; + }else{ + list_shift.push(next_tr); + cur_tr = next_tr; + } } - list_shift.reverse() - + }else{last_tr = cur_tr.next();} + if(last_tr.length != 0 && last_tr.attr('level')==level){ + var last_tr_id = (last_tr.attr('id')).split('-')[1]; + img = last_tr.find("img[id='parentimg-"+last_tr_id+"']").attr('src'); + if(img){ + $("img[id='parentimg-"+last_tr_id+"']").attr('src', '/web/static/src/img/expand.gif'); + while(1){ + var next_tr = last_tr.next(); + if (next_tr.attr('level') <= level || next_tr.length==0){break;} + next_tr.hide(); + last_tr = next_tr; + } + } + list_shift.reverse(); + _.each(list_shift,function(rec){ + $(last_tr).after(rec); + }); } - _.each(list_shift,function(rec){ - $(last_tr).after(rec); - }); break; } }); From 0d9bd77377f55d488db572fc5d0c1bb084408d67 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 27 Sep 2011 12:34:13 +0530 Subject: [PATCH 4/7] [FIX]side_id not define bzr revid: vme@tinyerp.com-20110927070413-qjhjmc853141i4so --- addons/web/static/src/js/view_editor.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index fd4fcde9ee3..3194a8aef03 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -121,7 +121,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var string = self.check_attr(child_node,child_node.tagName.toLowerCase(),parents.length); child_obj_list.push(string); }); - if(children_list.length != 0){ var child_ids = _.map(child_obj_list ,function(num){return num.id;}); parent_child_id.push({'key': parent_id, 'value': child_ids}); @@ -144,22 +143,23 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var root = $(arch).filter(":first")[0]; var tag = root.tagName.toLowerCase(); var root_object = self.check_attr(root,tag,0); - var one_object = self.children_function(arch,tag,[],0,[root_object],[]); - return self.edit_view(one_object); + return self.children_function(arch,tag,[],0,[root_object],[]); }, get_data : function(){ var self = this; + var inherited_view =[]; + var result; var view_id =(($("input[name='radiogroup']:checked").parent()).parent()).attr('data-id'); - dataset = new openerp.web.DataSetSearch(this,'ir.ui.view', null, null); - dataset.read_slice([],{domain : [['inherit_id','=',parseInt(view_id)]]},function (result) { - _.each(result ,function(num){ - // todo xpath - }); - }); var ve_dataset = new openerp.web.DataSet(this,'ir.ui.view'); + dataset = new openerp.web.DataSetSearch(self,'ir.ui.view', null, null); + dataset.read_slice([],{domain : [['inherit_id','=',parseInt(view_id)]]},function (result) { + return result; + }); ve_dataset.read_ids([parseInt(view_id)],['arch'],function (arch){ - self.parse_xml(arch[0].arch); - }); + var one_object = self.parse_xml(arch[0].arch); + return self.edit_view(one_object); + }); + }, edit_view : function(one_object){ var self = this; @@ -200,7 +200,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }); $("img[id^='side-']").click(function() { - var side = $(this).closest("'tr[id^='viewedit-']'") + var side = $(this).closest("tr[id^='viewedit-']") var id_tr = (side.attr('id')).split('-')[1]; switch (this.id) { From 889cff8a19e289568a855c950e65cc07ff36b075 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 27 Sep 2011 12:47:53 +0530 Subject: [PATCH 5/7] [IMP]removed unnecessary variables bzr revid: vme@tinyerp.com-20110927071753-hp5qwox2wgt1bws5 --- addons/web/static/src/js/view_editor.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 3194a8aef03..b8ceec94845 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -65,7 +65,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ obj.child_id = []; obj.id = this.xml_id++; obj.level = level; - var vidhin = xml; var att_list = []; var name1 = "<" + tag; var xml_tag = "<" + tag; From 654478b811b3f2e42aba489b0f70d71497ff66ea Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 30 Sep 2011 18:19:32 +0530 Subject: [PATCH 6/7] [IMP]developed code for @ sign inherit view with xpath. bzr revid: vme@tinyerp.com-20110930124932-78pdg9o6o450rnur --- addons/web/static/src/js/view_editor.js | 391 ++++++++++++++---------- 1 file changed, 230 insertions(+), 161 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index b8ceec94845..46e83576eb2 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -1,6 +1,7 @@ openerp.web.view_editor = function(openerp) { var QWeb = openerp.web.qweb; openerp.web.ViewEditor = openerp.web.Widget.extend({ + init: function(parent, element_id, dataset, view, options) { this._super(parent); this.element_id = element_id @@ -9,55 +10,55 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ this.model = dataset.model; this.xml_id = 0; }, + start: function() { this.View_editor(); }, + View_editor : function(){ - var self = this; - var action = { - name:'ViewEditor', - context:this.session.user_context, - domain: [["model", "=", this.dataset.model]], - res_model: 'ir.ui.view', - views : [[false, 'list']], - type: 'ir.actions.act_window', - target: "current", - limit : 80, - auto_search : true, - flags: { - sidebar: false, - views_switcher: false, - action_buttons:false, - search_view:false, - pager:false, - radio:true - }, - }; - var action_manager = new openerp.web.ActionManager(this); - this.dialog = new openerp.web.Dialog(this,{ - modal: true, - title: 'ViewEditor', - width: 750, - height: 500, - buttons: { - "Create": function(){ - - }, - "Edit": function(){ - self.xml_id = 0 ; - self.get_data(); - - }, - "Close": function(){ - $(this).dialog('destroy'); - } - }, - - }); - this.dialog.start(); - this.dialog.open(); - action_manager.appendTo(this.dialog); - action_manager.do_action(action); + var self = this; + var action = { + name:'ViewEditor', + context:this.session.user_context, + domain: [["model", "=", this.dataset.model]], + res_model : 'ir.ui.view', + views : [[false, 'list']], + type: 'ir.actions.act_window', + target: "current", + limit : 80, + auto_search : true, + flags: { + sidebar: false, + views_switcher: false, + action_buttons:false, + search_view:false, + pager:false, + radio:true + }, + }; + var action_manager = new openerp.web.ActionManager(this); + this.dialog = new openerp.web.Dialog(this,{ + modal: true, + title: 'ViewEditor', + width: 750, + height: 500, + buttons: { + "Create": function(){ + //to do + }, + "Edit": function(){ + self.xml_id = 0 ; + self.get_data(); + }, + "Close": function(){ + $(this).dialog('destroy'); + } + }, + }); + this.dialog.start(); + this.dialog.open(); + action_manager.appendTo(this.dialog); + action_manager.do_action(action); }, check_attr:function(xml,tag,level){ @@ -66,25 +67,25 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ obj.id = this.xml_id++; obj.level = level; var att_list = []; - var name1 = "<" + tag; + var render_name = "<" + tag; var xml_tag = "<" + tag; $(xml).each(function() { att_list = this.attributes; att_list = _.select(att_list, function(attrs){ - xml_tag += ' ' +attrs.nodeName+'='+'"'+attrs.nodeValue+'"'; - if (tag != 'button'){ - if(attrs.nodeName == "string" || attrs.nodeName == "name" || attrs.nodeName == "index"){ - name1 += ' ' +attrs.nodeName+'='+'"'+attrs.nodeValue+'"';} - }else{ - if(attrs.nodeName == "name"){ - name1 += ' ' +attrs.nodeName+'='+'"'+attrs.nodeValue+'"';} - } - }); - name1+= ">"; - xml_tag+= ">"; - }); + xml_tag += ' ' +attrs.nodeName+'='+'"'+attrs.nodeValue+'"'; + if (tag != 'button'){ + if(attrs.nodeName == "string" || attrs.nodeName == "name" || attrs.nodeName == "index"){ + render_name += ' ' +attrs.nodeName+'='+'"'+attrs.nodeValue+'"';} + }else{ + if(attrs.nodeName == "name"){ + render_name += ' ' +attrs.nodeName+'='+'"'+attrs.nodeValue+'"';} + } + }); + render_name+= ">"; + xml_tag+= ">"; + }); obj.main_xml = xml_tag; - obj.name = name1; + obj.name = render_name; return obj; }, @@ -93,13 +94,13 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var check_id = parent_list[0]; var p_list = parent_list.slice(1); if(val.child_id.length != 0){ - $.each(val.child_id, function(key,val) { + $.each(val.child_id, function(key,val) { if(val.id==check_id){ if(p_list.length!=0){ self.save_object(val,p_list,child_obj_list); }else{ val.child_id = child_obj_list; - return; + return; } } }); @@ -116,49 +117,121 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 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){ + _.each(children_list, function(child_node){ var string = self.check_attr(child_node,child_node.tagName.toLowerCase(),parents.length); child_obj_list.push(string); }); + if(children_list.length != 0){ var child_ids = _.map(child_obj_list ,function(num){return num.id;}); parent_child_id.push({'key': parent_id, 'value': child_ids}); var parents = $(children_list[0]).parents().get(); if(parents.length <= parent_list.length){ - parent_list.splice(parents.length-1);} + parent_list.splice(parents.length-1); + } parent_list.push(parent_id); $.each(main_object, function(key,val) { self.save_object(val,parent_list.slice(1),child_obj_list); }); } + for(var i=0;i= prev_tr.attr('level') || prev_tr.length==0){ - last_tr = prev_tr; - break; + case "side-add": + break; + case "side-remove": + break; + case "side-edit": + break; + case "side-up": + while(1){ + var prev_tr = cur_tr.prev(); + if(level >= prev_tr.attr('level') || prev_tr.length==0){ + last_tr = prev_tr; + break; } - cur_tr = prev_tr; - } - if(img){ - while(1){ - var next_tr = side.next(); - if(next_tr.attr('level') <= level || next_tr.length==0){ - break; - }else{ - list_shift.push(next_tr); - side = next_tr; - } + cur_tr = prev_tr; } - } - if(last_tr.length!=0 && last_tr.attr('level') == level){ - _.each(list_shift,function(rec){ - $(last_tr).before(rec); - }); - } - break; - case "side-down": - var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); - var level = side.attr('level'); - var list_shift =[]; - var last_tr; - var next_tr; - var cur_tr = side; - list_shift.push(side); - if(img){ - while(1){ - var next_tr = cur_tr.next(); + if(img){ + while(1){ + next_tr = side.next(); if(next_tr.attr('level') <= level || next_tr.length==0){ - last_tr = next_tr; break; }else{ + list_shift.push(next_tr); + side = next_tr; + } + } + } + if(last_tr.length!=0 && last_tr.attr('level') == level){ + _.each(list_shift,function(rec){ + $(last_tr).before(rec); + }); + } + break; + case "side-down": + if(img){ + while(1){ + next_tr = cur_tr.next(); + if(next_tr.attr('level') <= level || next_tr.length==0){ + last_tr = next_tr; + break; + }else{ list_shift.push(next_tr); cur_tr = next_tr; - } - } - }else{last_tr = cur_tr.next();} + } + } + } + else{ + last_tr = cur_tr.next(); + } if(last_tr.length != 0 && last_tr.attr('level')==level){ var last_tr_id = (last_tr.attr('id')).split('-')[1]; img = last_tr.find("img[id='parentimg-"+last_tr_id+"']").attr('src'); @@ -270,16 +339,16 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ while(1){ var next_tr = last_tr.next(); if (next_tr.attr('level') <= level || next_tr.length==0){break;} - next_tr.hide(); - last_tr = next_tr; + next_tr.hide(); + last_tr = next_tr; } - } + } list_shift.reverse(); _.each(list_shift,function(rec){ - $(last_tr).after(rec); - }); + $(last_tr).after(rec); + }); } - break; + break; } }); }, From 5e07d121a63e959b22e0982a4473e9104c46d211 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 3 Oct 2011 15:19:31 +0530 Subject: [PATCH 7/7] [IMP]hide and show of inherited view and reduce code. bzr revid: vme@tinyerp.com-20111003094931-4jsh8rwmum4ak0z1 --- addons/web/static/src/js/view_editor.js | 67 ++++++++++++++----------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 46e83576eb2..2650f966c7e 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -143,7 +143,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ return {"main_object":main_object,"parent_child_id":parent_child_id}; }, - parse_xml :function(arch){ + parse_xml :function(arch,view_id){ var self = this; var root = $(arch).filter(":first")[0]; var tag = root.tagName.toLowerCase(); @@ -156,7 +156,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var view_id =(($("input[name='radiogroup']:checked").parent()).parent()).attr('data-id'); var ve_dataset = new openerp.web.DataSet(this,'ir.ui.view'); ve_dataset.read_ids([parseInt(view_id)],['arch'],function (arch){ - one_object = self.parse_xml(arch[0].arch); + one_object = self.parse_xml(arch[0].arch,view_id); one_object.arch = arch[0].arch; dataset = new openerp.web.DataSetSearch(self,'ir.ui.view', null, null); dataset.read_slice([],{domain : [['inherit_id','=',parseInt(view_id)]]},function (result) { @@ -181,7 +181,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ xpath_list.push(root[0]); } _.each(xpath_list,function(element){ - var xpath_object = self.parse_xml(element); + var xpath_object = self.parse_xml(element,result.id); var expr = $(element).attr('expr'); var position = $(element).attr('position'); part_expr = expr.split("/"); @@ -192,39 +192,47 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } if(part_expr[part_expr.length-1].search("@")!=-1){ var part = part_expr[part_expr.length-1]; - var pp = $.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,' ')).split(" "); + var xpath_list = $.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,' ')).split(" "); + one_object['parent_child_id'].push(xpath_object['parent_child_id'][0]); $.each(one_object['main_object'], function(key,val) { - self.search_object(val,pp,[],position,xpath_object['main_object']); + var id = self.search_object(val,xpath_list,[],position,xpath_object['main_object'],[]); + _.detect(one_object['parent_child_id'],function(res){ + if(res.key==id){ + res.value.push(xpath_object['main_object'][0].id); + } + }); }); } }); }, - search_object:function(val,list,p_list,position,xpath_object){ + search_object:function(val,list,p_list,position,xpath_object,r_list){ var self = this; - var pp = $.trim(val.name.replace(/[^a-zA-Z 0-9 _]+/g,' ')).split(" "); - var insert = _.intersection(pp,list); - if(insert.length == list.length){ - var level = val.level; - $.each(xpath_object, function(key,val) { - self.increase_level(val,level) - }); - var index = _.indexOf(p_list.child_id,val); - if(position == "before"){ - if(index!=0){index--;} - }else if(position == "after"){ - index++; - } - var check = _.indexOf(p_list.child_id,xpath_object[0]); - if(check == -1){ + var return_list = r_list; + var main_list = $.trim(val.name.replace(/[^a-zA-Z 0-9 _]+/g,' ')).split(" "); + var insert = _.intersection(main_list,list); + var check = _.indexOf(p_list.child_id,xpath_object[0]); + if(check == -1){ + if(insert.length == list.length){ + var level = val.level; + $.each(xpath_object, function(key,val) { + self.increase_level(val,level) + }); + var index = _.indexOf(p_list.child_id,val); + if(position == "before"){ + if(index!=0){index--;} + }else if(position == "after"){ + index++; + } p_list.child_id.splice(index,0,xpath_object[0]); - return val.id; + return_list.push(p_list.id); + }else{ + if(val.child_id.length!=0){p_list = val;} + $.each(val.child_id, function(key,val) { + self.search_object(val,list,p_list,position,xpath_object,return_list); + }); } - }else{ - if(val.child_id.length!=0){p_list = val;} - $.each(val.child_id, function(key,val) { - self.search_object(val,list,p_list,position,xpath_object); - }); } + return return_list; }, increase_level :function(val,level){ var self = this; @@ -268,7 +276,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ self.on_expand(this); }else{ $(this).attr('src', '/web/static/src/img/collapse.gif'); - self.on_collapse(this,one_object['parent_child_id']); + var id = this.id.split('-')[1]; + self.on_collapse(this,one_object['parent_child_id'],one_object['main_object']); } }); $("img[id^='side-']").click(function() { @@ -363,7 +372,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }else return nxt_tr; } }, - on_collapse: function(self,parent_child_id,id){ + on_collapse: function(self,parent_child_id,id,main_object){ var id = self.id.split('-')[1]; var datas = _.detect(parent_child_id,function(res){ return res.key == id;