From e85e6c5836277143a7e8252ff4cab21adf51d22c Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Wed, 2 Nov 2011 12:37:10 +0530 Subject: [IMP]hide child tr when up arrow click. bzr revid: vme@tinyerp.com-20111102070710-kijqa4q0xtu049ac --- addons/web/static/src/js/view_editor.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'addons/web/static/src/js/view_editor.js') diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index f41b77f1744..3e19712f08c 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -56,8 +56,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ action_manager.appendTo(this.view_edit_dialog); action_manager.do_action(action); }, - check_attr: function(xml, tag, level) { + check_attr: function(xml, level) { var obj = {'child_id':[],'id':this.xml_id++,'level':level+1,'att_list':[],'name':""}; + var tag = xml.tagName.toLowerCase(); var render_name = "<" + tag; obj.att_list.push(tag); $(xml).each(function() { @@ -101,7 +102,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var children_list = $(xml).filter(root).children(); var parents = $(children_list[0]).parents().get(); _.each(children_list, function (child_node) { - child_obj_list.push(self.check_attr(child_node,child_node.tagName.toLowerCase(),parents.length)); + child_obj_list.push(self.check_attr(child_node,parents.length)); }); if (children_list.length != 0) { if (parents.length <= parent_list.length) { @@ -121,7 +122,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var root = $(arch).filter(":first")[0]; var tag = root.tagName.toLowerCase(); var obj ={'child_id':[],'id':this.xml_id++,'level':0,'att_list':[],'name':""}; - var root_object = this.check_attr(root,tag,0); + var root_object = this.check_attr(root,0); obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], []) return [obj]; }, @@ -326,11 +327,14 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ cur_tr = prev_tr; } if (img) { + self.edit_xml_dialog.$element.find("img[id='parentimg-" + id_tr + "']"). + attr('src', '/web/static/src/img/expand.gif'); while (1) { next_tr = side.next(); if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) { break; } else { + next_tr.hide(); list_shift.push(next_tr); side = next_tr; } @@ -384,7 +388,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ $(last_tr).after(rec); }); self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "down"); - } break; } @@ -399,7 +402,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ if(($(arch.arch).filter("data")).length != 0 && view_xml_id != 0){ var check_list = _.flatten(obj[0].child_id[0].att_list); arch.arch = _.detect($(arch.arch).children(), function(xml_child){ - var temp_obj = self.check_attr(xml_child, xml_child.tagName.toLowerCase()); + var temp_obj = self.check_attr(xml_child); var main_list = _.flatten(temp_obj.att_list); check_list = _.uniq(check_list); var insert = _.intersection(main_list,check_list); @@ -473,7 +476,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ return false; } } - }, on_expand: function(expand_img){ @@ -499,6 +501,5 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ tr.show(); }); } - }); }; -- cgit v1.2.3 From a25c1ed24c0a5e941a85a279f93745b973c6d71d Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Wed, 2 Nov 2011 18:44:13 +0530 Subject: [IMP]remove unused variables. bzr revid: vme@tinyerp.com-20111102131413-bn7e95njx4vlxc7q --- addons/web/static/src/js/view_editor.js | 109 ++++++++++++++------------------ 1 file changed, 49 insertions(+), 60 deletions(-) (limited to 'addons/web/static/src/js/view_editor.js') diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 3e19712f08c..b402da6a13a 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -7,7 +7,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ this.parent = parent this.dataset = dataset; this.model = dataset.model; - this.xml_id = 0; + this.xml_element_id = 0; }, start: function() { this.View_editor(); @@ -43,8 +43,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ //to do }, "Edit": function(){ - self.xml_id=0; - self.get_data(); + self.xml_element_id=0; + self.get_arch(); }, "Close": function(){ $(this).dialog('destroy'); @@ -56,84 +56,75 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ action_manager.appendTo(this.view_edit_dialog); action_manager.do_action(action); }, - check_attr: function(xml, level) { - var obj = {'child_id':[],'id':this.xml_id++,'level':level+1,'att_list':[],'name':""}; + + convert_tag_to_obj: function(xml, level) { + var obj = {'child_id':[],'id':this.xml_element_id++,'level':level+1,'att_list':[],'name':""}; var tag = xml.tagName.toLowerCase(); - var render_name = "<" + tag; obj.att_list.push(tag); + obj.name = "<"+ tag $(xml).each(function() { _.each(this.attributes, function(attrs){ - if (tag != 'button') { - if (attrs.nodeName == "string" || attrs.nodeName == "name" || attrs.nodeName == "index") { - render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;} + if (tag != 'button' && tag != 'field') { + if (attrs.nodeName == "string" ) { + obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;} } else { if (attrs.nodeName == "name") { - render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';} + obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';} } obj.att_list.push( [attrs.nodeName,attrs.nodeValue] ); }); - render_name+= ">"; + obj.name+= ">"; }); - obj.name = render_name; return obj; }, - save_object: function(val, parent_list, child_obj_list) { + + append_child_object: function(val, parent_list, child_obj_list) { var self = this; - var check_id = parent_list[0]; - var p_list = parent_list.slice(1); if (val.child_id.length != 0) { - _.each(val.child_id, function(val, key) { - 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 false; - } - } + _.each(val.child_id, function(val) { + (val.id == parent_list[0])? + self.append_child_object( val, parent_list.slice(1), child_obj_list) : false; }); - } else { - val.child_id = child_obj_list; - } + } else { val.child_id = child_obj_list; } }, - xml_node_create: function(xml, root, parent_list, parent_id, main_object){ + + convert_arch_to_obj: function(xml, parent_list, parent_id, main_object){ var self = this; var child_obj_list = []; - var children_list = $(xml).filter(root).children(); + var children_list = $(xml).children(); var parents = $(children_list[0]).parents().get(); _.each(children_list, function (child_node) { - child_obj_list.push(self.check_attr(child_node,parents.length)); + child_obj_list.push(self.convert_tag_to_obj(child_node,parents.length)); }); if (children_list.length != 0) { - if (parents.length <= parent_list.length) { - parent_list.splice(parents.length - 1); - } + if(parents.length <= parent_list.length) {parent_list.splice(parents.length - 1);} parent_list.push(parent_id); - self.save_object(main_object[0], parent_list.slice(1), child_obj_list); + self.append_child_object(main_object[0], parent_list.slice(1), child_obj_list); } for (var i=0; i"}; - var root_object = this.check_attr(root,0); - obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], []) - return [obj]; + var view_obj ={'child_id':[],'id':this.xml_element_id++, + 'level':0,'att_list':[],'name':""}; + var root_object = this.convert_tag_to_obj(root,0); + view_obj.child_id = this.convert_arch_to_obj(arch, [], this.xml_element_id, [root_object], []); + return [view_obj]; }, - get_data: function() { + get_arch: function() { var self = this; - var view_arch_list = []; - var view_id =((this.view_edit_dialog.$element.find("input[name='radiogroup']:checked").parent()).parent()).attr('data-id'); + var view_id = + ((this.view_edit_dialog.$element.find("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,view_id); + one_object = self.parse_xml(arch[0].arch, view_id); view_arch_list.push({"view_id" : view_id, "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) { @@ -195,30 +186,30 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ switch (check.length) { case 2: if(parseInt(check[1])){ + //for field[3] var list_1 = _.select(val,function(element){ - var main_list = _.flatten(element.att_list); - return _.include(main_list, check[0]); + return _.include(_.flatten(element.att_list), check[0]); }); obj = val[_.indexOf(val,list_1[parseInt(check[1])-1])]; } else { + //for notebook[last()] obj = _.detect(val, function(element){ - var main_list = _.flatten(element.att_list); - return _.include(main_list, check[0]); + return _.include(_.flatten(element.att_list), check[0]); }); } break; case 3: + //for field[@name='type'] obj = _.detect(val,function(element){ - var main_list = _.flatten(element.att_list); - check = _.uniq(check); - var insert = _.intersection(main_list,check); - if(insert.length == check.length ){return element;} + if((_.intersection(_.flatten(element.att_list),_.uniq(check))).length == check.length){ + return element; + } }); break; case 1: + //for /form/notebook var list_1 = _.select(val,function(element){ - var main_list = _.flatten(element.att_list); - return _.include(main_list, check[0]); + return _.include(_.flatten(element.att_list), check[0]); }); if(list_1.length != 0){ (check_list.length == 1)? obj = list_1[0] : check_list.shift(); @@ -230,8 +221,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ if (check_list.length !=0){ self.full_path_search(check_list ,obj.child_id ,xpath_object); } else { - var level = obj.level+1; - self.increase_level(xpath_object[0], level) + self.increase_level(xpath_object[0], obj.level+1); obj.child_id.push(xpath_object[0]); xpath_object.pop(); return; @@ -402,10 +392,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ if(($(arch.arch).filter("data")).length != 0 && view_xml_id != 0){ var check_list = _.flatten(obj[0].child_id[0].att_list); arch.arch = _.detect($(arch.arch).children(), function(xml_child){ - var temp_obj = self.check_attr(xml_child); + var temp_obj = self.convert_tag_to_obj(xml_child); var main_list = _.flatten(temp_obj.att_list); - check_list = _.uniq(check_list); - var insert = _.intersection(main_list,check_list); + var insert = _.intersection(main_list,_.uniq(check_list)); if(insert.length == check_list.length ){return xml_child;} }); } -- cgit v1.2.3 From 13aaf10a5f2980bec068a3eef33c7af556ae9c03 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 3 Nov 2011 11:44:25 +0530 Subject: [IMP]reduced code and given proper name. bzr revid: vme@tinyerp.com-20111103061425-223ika1xh70zefu5 --- addons/web/static/src/js/view_editor.js | 154 +++++++++++++++----------------- 1 file changed, 71 insertions(+), 83 deletions(-) (limited to 'addons/web/static/src/js/view_editor.js') diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index b402da6a13a..629f13b39f7 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -118,89 +118,80 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }, get_arch: function() { var self = this; - var view_arch_list = []; var view_id = ((this.view_edit_dialog.$element.find("input[name='radiogroup']:checked").parent()).parent()) .attr('data-id'); + var view_arch_list = []; 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, view_id); + arch_object = self.parse_xml(arch[0].arch, view_id); view_arch_list.push({"view_id" : view_id, "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) { _.each(result, function(res) { view_arch_list.push({"view_id":res.id,"arch":res.arch}); - self.inherit_view(one_object, res); + self.inherit_view(arch_object, res); }); - return self.edit_view({"main_object": one_object, - "parent_child_id": self.parent_child_list(one_object, []), + return self.edit_view({"main_object": arch_object, + "parent_child_id": self.parent_child_list(arch_object, []), "arch": view_arch_list}); }); }); }, - parent_child_list : function(one_object, p_list) { + parent_child_list : function(one_object, parent_list) { var self = this; _.each(one_object , function(element){ if(element.child_id.length != 0){ - p_list.push({"key":element.id,"value":_.pluck(element.child_id, 'id')}); - self.parent_child_list(element.child_id, p_list); + parent_list.push({"key":element.id,"value":_.pluck(element.child_id, 'id')}); + self.parent_child_list(element.child_id, parent_list); } }); - return p_list; + return parent_list; }, - inherit_view : function(one_object, result) { + inherit_view : function(arch_object, result) { var self = this; var root = $(result.arch).filter('*'); var xml_list = []; - if (root[0].tagName.toLowerCase() == "data") { - xml_list = $(root[0]).children(); - } else { - xml_list.push(root[0]); - } + (root[0].tagName.toLowerCase() == "data")?xml_list = $(root[0]).children() : xml_list.push(root[0]); _.each(xml_list , function(xml){ - var parent_id; - var check_list = []; - var xpath_object = self.parse_xml(xml,result.id); + var expr_to_list = []; + var xpath_arch_object = self.parse_xml(xml,result.id); if (xml.tagName.toLowerCase() == "xpath" ) { var part_expr = _.without($(xml).attr('expr').split("/"),""); _.each(part_expr,function(part){ - check_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"),"")); + expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"),"")); }); } else { - var temp = []; - _.each(xpath_object[0].child_id[0].att_list, function(list){ - if(!_.include(list, "position")){ - temp.push(list); - } - }); - check_list = [_.flatten(temp)]; + var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) + { return _.include(list, "position")}); + expr_to_list = [_.flatten(temp)]; } - self.full_path_search(check_list ,one_object ,xpath_object); + self.inherit_apply(expr_to_list ,arch_object ,xpath_arch_object); }); }, - full_path_search: function(check_list ,val ,xpath_object) { + inherit_apply: function(expr_list ,arch_object ,xpath_arch_object) { var self = this; - if(xpath_object.length!=0){ - var check = check_list[0]; + if(xpath_arch_object.length!=0){ + var check = expr_list[0]; var obj; switch (check.length) { case 2: if(parseInt(check[1])){ //for field[3] - var list_1 = _.select(val,function(element){ + var temp_list = _.select(arch_object,function(element){ return _.include(_.flatten(element.att_list), check[0]); }); - obj = val[_.indexOf(val,list_1[parseInt(check[1])-1])]; + obj = arch_object[_.indexOf(arch_object,temp_list[parseInt(check[1])-1])]; } else { //for notebook[last()] - obj = _.detect(val, function(element){ + obj = _.detect(arch_object, function(element){ return _.include(_.flatten(element.att_list), check[0]); }); } break; case 3: //for field[@name='type'] - obj = _.detect(val,function(element){ + obj = _.detect(arch_object, function(element){ if((_.intersection(_.flatten(element.att_list),_.uniq(check))).length == check.length){ return element; } @@ -208,28 +199,27 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ break; case 1: //for /form/notebook - var list_1 = _.select(val,function(element){ + var temp_list = _.select(arch_object, function(element){ return _.include(_.flatten(element.att_list), check[0]); }); - if(list_1.length != 0){ - (check_list.length == 1)? obj = list_1[0] : check_list.shift(); + if(temp_list.length != 0){ + (expr_list.length == 1)? obj = temp_list[0] : expr_list.shift(); } break; } if(obj) { - check_list.shift(); - if (check_list.length !=0){ - self.full_path_search(check_list ,obj.child_id ,xpath_object); + expr_list.shift(); + if (expr_list.length !=0){ + self.inherit_apply(expr_list ,obj.child_id ,xpath_arch_object); } else { - self.increase_level(xpath_object[0], obj.level+1); - obj.child_id.push(xpath_object[0]); - xpath_object.pop(); - return; + self.increase_level(xpath_arch_object[0], obj.level+1); + obj.child_id.push(xpath_arch_object[0]); + xpath_arch_object.pop(); } } else { - _.each(val,function(element){ - self.full_path_search(check_list ,element.child_id ,xpath_object); + _.each(arch_object,function(element){ + self.inherit_apply(expr_list ,element.child_id ,xpath_arch_object); }); } } @@ -280,23 +270,23 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() { var side = $(this).closest("tr[id^='viewedit-']") - var id_tr = (side.attr('id')).split('-')[1]; - var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); ; - var level = parseInt(side.attr('level')); - var list_shift =[]; - var last_tr; + var clicked_tr_id = (side.attr('id')).split('-')[1]; + var img = side.find("img[id='parentimg-"+clicked_tr_id+"']").attr('src'); ; + var clicked_tr_level = parseInt(side.attr('level')); var cur_tr = side; - list_shift.push(side); + var last_tr; var next_tr; - var ls = side; + var tr_to_move =[]; + tr_to_move.push(side); var view_id; var view_xml_id; + var view_find = side; while(1){ - ls = ls.prev(); - if((self.edit_xml_dialog.$element.find(ls).find('a').text()).search("view_id") != -1 - && parseInt(ls.attr('level')) < level){ - view_id = parseInt(($(ls).find('a').text()).replace(/[^0-9]+/g,'')); - view_xml_id = (ls.attr('id')).split('-')[1]; + view_find = view_find.prev(); + if((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1 + && parseInt(view_find.attr('level')) < clicked_tr_level){ + view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g,'')); + view_xml_id = (view_find.attr('id')).split('-')[1]; break; } } @@ -310,45 +300,45 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ case "side-up": while (1) { var prev_tr = cur_tr.prev(); - if(level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) { + if(clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) { last_tr = prev_tr; break; } cur_tr = prev_tr; } if (img) { - self.edit_xml_dialog.$element.find("img[id='parentimg-" + id_tr + "']"). + self.edit_xml_dialog.$element.find("img[id='parentimg-" + clicked_tr_id + "']"). attr('src', '/web/static/src/img/expand.gif'); while (1) { next_tr = side.next(); - if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) { + if ( parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) { break; } else { next_tr.hide(); - list_shift.push(next_tr); + tr_to_move.push(next_tr); side = next_tr; } } } if (last_tr.length != 0 - && parseInt(last_tr.attr('level')) == level + && parseInt(last_tr.attr('level')) == clicked_tr_level && (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) { - _.each(list_shift, function(rec) { + _.each(tr_to_move, function(rec) { $(last_tr).before(rec); }); - self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "up"); + self.save_move_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up"); } break; case "side-down": if (img) { while (1) { next_tr = cur_tr.next(); - if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) { + if ( parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) { last_tr = next_tr; break; } else { - list_shift.push(next_tr); + tr_to_move.push(next_tr); cur_tr = next_tr; } } @@ -359,7 +349,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ if((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1){ return; } - if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == level) { + if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_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) { @@ -367,28 +357,26 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 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; + if (next_tr.attr('level') <= clicked_tr_level || next_tr.length == 0) break; next_tr.hide(); last_tr = next_tr; } } - - list_shift.reverse(); - _.each(list_shift, function(rec) { + tr_to_move.reverse(); + _.each(tr_to_move, function(rec) { $(last_tr).after(rec); }); - self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "down"); + self.save_move_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "down"); } break; } }); }, - save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct){ + save_move_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, level, move_direct){ var self = this; - var arch = _.detect(one_object['arch'],function(element){ - return element.view_id == view_id; - }); - var obj = self.get_view_object(view_xml_id, one_object['main_object'], []); + var arch = _.detect(one_object['arch'],function(element){return element.view_id == view_id;}); + var obj = self.get_object_by_id(view_xml_id, one_object['main_object'], []); + //for finding xpath tag from inherit view if(($(arch.arch).filter("data")).length != 0 && view_xml_id != 0){ var check_list = _.flatten(obj[0].child_id[0].att_list); arch.arch = _.detect($(arch.arch).children(), function(xml_child){ @@ -398,11 +386,11 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ if(insert.length == check_list.length ){return xml_child;} }); } - return self.get_node(arch.arch, obj[0].child_id[0], parseInt(id_tr), [], parseInt(level), + return self.save_arch(arch.arch, obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(level), parseInt(view_id), arch, move_direct); }, - get_view_object: function(view_xml_id, one_object,result){ + get_object_by_id: function(view_xml_id, one_object,result){ var self = this; if(result.length==0){ var check = _.detect(one_object , function(obj){ @@ -410,13 +398,13 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); if(check){result.push(check);}; _.each(one_object, function(obj){ - self.get_view_object(view_xml_id, obj.child_id, result); + self.get_object_by_id(view_xml_id, obj.child_id, result); }); } return result; }, - get_node: function(arch1, obj, id, child_list, level, view_id, arch, move_direct){ + save_arch: function(arch1, obj, id, child_list, level, view_id, arch, move_direct){ var self = this; var children_list = $(arch1).children(); var list_obj_xml = _.zip(children_list,obj.child_id); @@ -448,7 +436,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } if(obj.level <= level){ _.each(list_obj_xml, function(child_node){ - self.get_node(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct); + self.save_arch(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct); }); } } -- cgit v1.2.3 From a100ce70b00e21a51aa46c4796db8e1e2ae07f2c Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 3 Nov 2011 17:47:30 +0530 Subject: [IMP] vieweditor :- improve code. bzr revid: ysa@tinyerp.com-20111103121730-ev0n4v6swetak1jw --- addons/web/static/src/js/view_editor.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'addons/web/static/src/js/view_editor.js') diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index c26fecc062c..570f602fff0 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -15,22 +15,22 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ init_view_editor: function() { var self = this; var action = { - name:'ViewEditor', - context:this.session.user_context, + name: _.sprintf("Manage Views (%s)", this.model), + context: this.session.user_context, domain: [["model", "=", this.dataset.model]], - res_model : 'ir.ui.view', - views : [[false, 'list']], + res_model: 'ir.ui.view', + views: [[false, 'list']], type: 'ir.actions.act_window', target: "current", - limit : 80, - auto_search : true, + limit: this.dataset.limit || 80, + auto_search: true, flags: { sidebar: false, deletable: false, views_switcher: false, - action_buttons:false, - search_view:false, - pager:false, + action_buttons: false, + search_view: false, + pager: false, radio: true }, }; @@ -44,11 +44,11 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ //to do }, "Edit": function(){ - self.xml_element_id=0; + self.xml_element_id = 0; self.get_arch(); }, "Close": function(){ - $(this).dialog('destroy'); + self.view_edit_dialog.close(); } }, }).start().open(); @@ -334,7 +334,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } } } - if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_level && + if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_level && (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) { _.each(tr_to_move, function(rec) { $(last_tr).before(rec); -- cgit v1.2.3 From bc9c13dc0c16dad4fb705e2512db1dc5f7d9f373 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 3 Nov 2011 17:55:20 +0530 Subject: [IMP] vieweditor :- improve code of select view in manage view list. bzr revid: ysa@tinyerp.com-20111103122520-neun6etb7dxr1ahw --- addons/web/static/src/js/view_editor.js | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'addons/web/static/src/js/view_editor.js') diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 570f602fff0..3176f8e72fd 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -40,21 +40,31 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ width: 750, height: 500, buttons: { - "Create": function(){ - //to do - }, - "Edit": function(){ - self.xml_element_id = 0; - self.get_arch(); + "Create": function(){ + //to do + }, + "Edit": function(){ + self.xml_element_id = 0; + self.get_arch(); + }, + "Close": function(){ + self.view_edit_dialog.close(); + } }, - "Close": function(){ - self.view_edit_dialog.close(); - } - }, }).start().open(); var action_manager = new openerp.web.ActionManager(this); action_manager.appendTo(this.view_edit_dialog); - action_manager.do_action(action); + $.when(action_manager.do_action(action)).then(function() { + var viewmanager = action_manager.inner_viewmanager, + controller = viewmanager.views[viewmanager.active_view].controller; + controller.on_loaded.add_last(function(){ + $(controller.groups).bind({ + 'selected': function(e, ids, records) { + self.main_view_id = ids[0]; + } + }) + }); + }); }, convert_tag_to_obj: function(xml, level) { @@ -119,7 +129,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ get_arch: function() { var self = this; var view_arch_list = []; - self.main_view_id =((this.view_edit_dialog.$element.find("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(self.main_view_id)], ['arch', 'type'], function (arch) { var arch_object = self.parse_xml(arch[0].arch,self.main_view_id); -- cgit v1.2.3 From bd1a87840738e40840dde22cc11656d108a02c99 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Thu, 3 Nov 2011 18:34:55 +0530 Subject: [IMP] vieweditor:- code refactor. bzr revid: ysa@tinyerp.com-20111103130455-u9i5okx02jioq3an --- addons/web/static/src/js/view_editor.js | 96 ++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 43 deletions(-) (limited to 'addons/web/static/src/js/view_editor.js') diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 3176f8e72fd..70a389a97fe 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -66,28 +66,34 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); }); }, - convert_tag_to_obj: function(xml, level) { - var obj = {'child_id':[],'id':this.xml_element_id++,'level':level+1,'att_list':[],'name':""}; + var obj = { + 'child_id': [], + 'id': this.xml_element_id++, + 'level': level + 1, + 'att_list': [], + 'name': '' + }; var tag = xml.tagName.toLowerCase(); obj.att_list.push(tag); - obj.name = "<"+ tag + obj.name = "<" + tag; $(xml).each(function() { - _.each(this.attributes, function(attrs){ - if (tag != 'button' && tag != 'field') { - if (attrs.nodeName == "string" ) { - obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;} - } else { - if (attrs.nodeName == "name") { - obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';} - } - obj.att_list.push( [attrs.nodeName,attrs.nodeValue] ); + _.each(this.attributes, function(attrs) { + if (tag != 'button' && tag != 'field') { + if (attrs.nodeName == "string" ) { + obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"'; + } + } else { + if (attrs.nodeName == "name") { + obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"'; + } + } + obj.att_list.push([attrs.nodeName, attrs.nodeValue]); }); - obj.name+= ">"; + obj.name += ">"; }); return obj; }, - append_child_object: function(val, parent_list, child_obj_list) { var self = this; if (val.child_id.length != 0) { @@ -97,60 +103,63 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); } else { val.child_id = child_obj_list; } }, - convert_arch_to_obj: function(xml, parent_list, parent_id, main_object){ var self = this; var child_obj_list = []; var children_list = $(xml).children(); var parents = $(children_list[0]).parents().get(); - _.each(children_list, function (child_node) { + _.each(children_list, function(child_node) { child_obj_list.push(self.convert_tag_to_obj(child_node,parents.length)); }); if (children_list.length != 0) { - if(parents.length <= parent_list.length) {parent_list.splice(parents.length - 1);} + if(parents.length <= parent_list.length) { parent_list.splice(parents.length - 1);} parent_list.push(parent_id); self.append_child_object(main_object[0], parent_list.slice(1), child_obj_list); } - for (var i=0; i"}; - var root_object = this.convert_tag_to_obj(root,0); + var view_obj = { + 'child_id': [], + 'id': this.xml_element_id++, + 'level': 0, + 'att_list': [], + 'name': _.sprintf("", view_id), + }; + var root_object = this.convert_tag_to_obj(root, 0); view_obj.child_id = this.convert_arch_to_obj(arch, [], this.xml_element_id, [root_object], []); return [view_obj]; }, get_arch: function() { var self = this; var view_arch_list = []; - var ve_dataset = new openerp.web.DataSet(this, 'ir.ui.view'); - ve_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function (arch) { - var arch_object = self.parse_xml(arch[0].arch,self.main_view_id); + var view_dataset = new openerp.web.DataSet(this, 'ir.ui.view'); + view_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function(arch) { + var arch_object = self.parse_xml(arch[0].arch, self.main_view_id); self.main_view_type = arch[0].type - view_arch_list.push({"view_id" : self.main_view_id, "arch" : arch[0].arch}); + view_arch_list.push({"view_id": self.main_view_id, "arch": arch[0].arch}); dataset = new openerp.web.DataSetSearch(self, 'ir.ui.view', null, null); - dataset.read_slice([], {domain : [['inherit_id','=', parseInt(self.main_view_id)]]}, function (result) { + dataset.read_slice([], {domain: [['inherit_id','=', parseInt(self.main_view_id)]]}, function(result) { _.each(result, function(res) { - view_arch_list.push({"view_id":res.id,"arch":res.arch}); + view_arch_list.push({"view_id": res.id, "arch": res.arch}); self.inherit_view(arch_object, res); }); return self.edit_view({"main_object": arch_object, - "parent_child_id": self.parent_child_list(arch_object, []), - "arch": view_arch_list}); + "parent_child_id": self.parent_child_list(arch_object, []), + "arch": view_arch_list}); }); }); }, parent_child_list : function(one_object, parent_list) { var self = this; - _.each(one_object , function(element){ - if(element.child_id.length != 0){ - parent_list.push({"key":element.id,"value":_.pluck(element.child_id, 'id')}); + _.each(one_object , function(element) { + if (element.child_id.length != 0) { + parent_list.push({"key": element.id, "value": _.pluck(element.child_id, 'id')}); self.parent_child_list(element.child_id, parent_list); } }); @@ -160,21 +169,22 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var self = this; var root = $(result.arch).filter('*'); var xml_list = []; - (root[0].tagName.toLowerCase() == "data")?xml_list = $(root[0]).children() : xml_list.push(root[0]); - _.each(xml_list , function(xml){ + root[0].tagName.toLowerCase() == "data"? xml_list = $(root[0]).children() : xml_list.push(root[0]); + _.each(xml_list, function(xml) { var expr_to_list = []; var xpath_arch_object = self.parse_xml(xml,result.id); if (xml.tagName.toLowerCase() == "xpath" ) { - var part_expr = _.without($(xml).attr('expr').split("/"),""); - _.each(part_expr,function(part){ - expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"),"")); + var part_expr = _.without($(xml).attr('expr').split("/"), ""); + _.each(part_expr, function(part) { + expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"), "")); }); } else { - var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) - { return _.include(list, "position")}); - expr_to_list = [_.flatten(temp)]; + var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) { + return _.include(list, "position") + }); + expr_to_list = [_.flatten(temp)]; } - self.inherit_apply(expr_to_list ,arch_object ,xpath_arch_object); + self.inherit_apply(expr_to_list, arch_object ,xpath_arch_object); }); }, inherit_apply: function(expr_list ,arch_object ,xpath_arch_object) { -- cgit v1.2.3 From 7ed841b241f5105ffb82a524af2979178ddab375 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Fri, 4 Nov 2011 10:36:01 +0530 Subject: [IMP] vieweditor :- code refactoring. bzr revid: ysa@tinyerp.com-20111104050601-igvnt3gqhe7bkfxp --- addons/web/static/src/js/view_editor.js | 123 ++++++++++++++++---------------- 1 file changed, 60 insertions(+), 63 deletions(-) (limited to 'addons/web/static/src/js/view_editor.js') diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 70a389a97fe..9e1cbf26072 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -189,20 +189,20 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }, inherit_apply: function(expr_list ,arch_object ,xpath_arch_object) { var self = this; - if(xpath_arch_object.length!=0){ + if (xpath_arch_object.length) { var check = expr_list[0]; var obj; switch (check.length) { case 2: - if(parseInt(check[1])){ + if (parseInt(check[1])) { //for field[3] - var temp_list = _.select(arch_object,function(element){ + var temp_list = _.select(arch_object, function(element) { return _.include(_.flatten(element.att_list), check[0]); }); - obj = arch_object[_.indexOf(arch_object,temp_list[parseInt(check[1])-1])]; + obj = arch_object[_.indexOf(arch_object, temp_list[parseInt(check[1]) - 1])]; } else { //for notebook[last()] - obj = _.detect(arch_object, function(element){ + obj = _.detect(arch_object, function(element) { return _.include(_.flatten(element.att_list), check[0]); }); } @@ -210,34 +210,34 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ case 3: //for field[@name='type'] obj = _.detect(arch_object, function(element){ - if((_.intersection(_.flatten(element.att_list),_.uniq(check))).length == check.length){ + if ((_.intersection(_.flatten(element.att_list), _.uniq(check))).length == check.length) { return element; } }); break; case 1: //for /form/notebook - var temp_list = _.select(arch_object, function(element){ + var temp_list = _.select(arch_object, function(element) { return _.include(_.flatten(element.att_list), check[0]); }); - if(temp_list.length != 0){ - (expr_list.length == 1)? obj = temp_list[0] : expr_list.shift(); + if (temp_list.length != 0) { + expr_list.length == 1 ? obj = temp_list[0] : expr_list.shift(); } break; } - if(obj) { + if (obj) { expr_list.shift(); - if (expr_list.length !=0){ - self.inherit_apply(expr_list ,obj.child_id ,xpath_arch_object); + if (expr_list.length) { + self.inherit_apply(expr_list, obj.child_id, xpath_arch_object); } else { - self.increase_level(xpath_arch_object[0], obj.level+1); + self.increase_level(xpath_arch_object[0], obj.level + 1); obj.child_id.push(xpath_arch_object[0]); xpath_arch_object.pop(); } } else { - _.each(arch_object,function(element){ - self.inherit_apply(expr_list ,element.child_id ,xpath_arch_object); + _.each(arch_object, function(element) { + self.inherit_apply(expr_list, element.child_id, xpath_arch_object); }); } } @@ -251,28 +251,28 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }, edit_view: function(one_object) { var self = this; - this.edit_xml_dialog = new openerp.web.Dialog(this,{ + this.edit_xml_dialog = new openerp.web.Dialog(this, { modal: true, title: 'View Editor', width: 750, height: 500, buttons: { - "Inherited View": function(){ + "Inherited View": function() { //todo }, - "Preview": function(){ + "Preview": function() { var action = { - context:self.session.user_context, - res_model : self.model, - views : [[self.main_view_id, self.main_view_type]], + context: self.session.user_context, + res_model: self.model, + views: [[self.main_view_id, self.main_view_type]], type: 'ir.actions.act_window', target: "new", flags: { sidebar: false, views_switcher: false, - action_buttons:false, - search_view:false, - pager:false, + action_buttons: false, + search_view: false, + pager: false, }, }; var action_manager = new openerp.web.ActionManager(self); @@ -282,11 +282,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ self.edit_xml_dialog.close(); } } - }); - this.edit_xml_dialog.start().open(); - this.edit_xml_dialog.$element.html(QWeb.render('view_editor', { - 'data': one_object['main_object'], - })); + }).start().open(); + this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {'data': one_object['main_object']})); this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").click(function() { self.edit_xml_dialog.$element.find("tr[id^='viewedit-']").removeClass('ui-selected'); $(this).addClass('ui-selected'); @@ -302,23 +299,23 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }); this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() { - var side = $(this).closest("tr[id^='viewedit-']") + var side = $(this).closest("tr[id^='viewedit-']"); var clicked_tr_id = (side.attr('id')).split('-')[1]; - var img = side.find("img[id='parentimg-"+clicked_tr_id+"']").attr('src'); ; + var img = side.find("img[id='parentimg-" + clicked_tr_id + "']").attr('src'); var clicked_tr_level = parseInt(side.attr('level')); var cur_tr = side; var last_tr; var next_tr; - var tr_to_move =[]; + var tr_to_move = []; tr_to_move.push(side); var view_id; var view_xml_id; var view_find = side; - while(1){ + while (1) { view_find = view_find.prev(); - if((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1 - && parseInt(view_find.attr('level')) < clicked_tr_level){ - view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g,'')); + if((self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1 + && parseInt(view_find.attr('level')) < clicked_tr_level) { + view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); view_xml_id = (view_find.attr('id')).split('-')[1]; break; } @@ -333,7 +330,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ case "side-up": while (1) { var prev_tr = cur_tr.prev(); - if(clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) { + if (clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) { last_tr = prev_tr; break; } @@ -341,10 +338,10 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } if (img) { self.edit_xml_dialog.$element.find("img[id='parentimg-" + clicked_tr_id + "']"). - attr('src', '/web/static/src/img/expand.gif'); + attr('src', '/web/static/src/img/expand.gif'); while (1) { next_tr = side.next(); - if ( parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) { + if (parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) { break; } else { next_tr.hide(); @@ -354,7 +351,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } } if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_level && - (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) { + (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) { _.each(tr_to_move, function(rec) { $(last_tr).before(rec); }); @@ -377,7 +374,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ else { last_tr = cur_tr.next(); } - if((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1){ + if ((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1) { return; } if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == clicked_tr_level) { @@ -403,32 +400,32 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }); }, - save_move_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, level, move_direct){ + save_move_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, level, move_direct) { var self = this; - var arch = _.detect(one_object['arch'],function(element){return element.view_id == view_id;}); + var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;}); var obj = self.get_object_by_id(view_xml_id, one_object['main_object'], []); //for finding xpath tag from inherit view - if(($(arch.arch).filter("data")).length != 0 && view_xml_id != 0){ + if (($(arch.arch).filter("data")).length != 0 && view_xml_id != 0) { var check_list = _.flatten(obj[0].child_id[0].att_list); arch.arch = _.detect($(arch.arch).children(), function(xml_child){ var temp_obj = self.convert_tag_to_obj(xml_child); var main_list = _.flatten(temp_obj.att_list); var insert = _.intersection(main_list,_.uniq(check_list)); - if(insert.length == check_list.length ){return xml_child;} + if (insert.length == check_list.length ) {return xml_child;} }); } return self.save_arch(arch.arch, obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(level), parseInt(view_id), arch, move_direct); }, - get_object_by_id: function(view_xml_id, one_object,result){ + get_object_by_id: function(view_xml_id, one_object, result) { var self = this; - if(result.length==0){ - var check = _.detect(one_object , function(obj){ - return view_xml_id==obj.id; + if (result.length == 0 ) { + var check = _.detect(one_object , function(obj) { + return view_xml_id == obj.id; }); - if(check){result.push(check);}; - _.each(one_object, function(obj){ + if (check) {result.push(check);}; + _.each(one_object, function(obj) { self.get_object_by_id(view_xml_id, obj.child_id, result); }); } @@ -442,7 +439,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ if (obj.id == id) { var id; var parent = $(arch1).parents(); - var index = _.indexOf(child_list, obj) + var index = _.indexOf(child_list, obj); var re_insert_obj = child_list.splice(index, 1); if (move_direct == "down") { var next = $(arch1).next(); @@ -453,19 +450,19 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ $(prev).before(arch1); child_list.splice(index-1, 0, re_insert_obj[0]); } - parent = parent[parent.length-1]; + parent = parent[parent.length - 1]; var convert_to_utf = self.xml2Str(parent); if (convert_to_utf) { convert_to_utf = convert_to_utf.replace('xmlns="http://www.w3.org/1999/xhtml"', ""); convert_to_utf = '' + convert_to_utf; arch.arch = convert_to_utf; dataset = new openerp.web.DataSet(this, 'ir.ui.view'); - dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { + dataset.write(parseInt(view_id),{"arch": convert_to_utf}, function(result) { }); } } - if(obj.level <= level){ - _.each(list_obj_xml, function(child_node){ + if (obj.level <= level) { + _.each(list_obj_xml, function(child_node) { self.save_arch(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct); }); } @@ -475,11 +472,11 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ try { return (new XMLSerializer()).serializeToString(xmlNode); } - catch (e) { + catch (exception) { try { return xmlNode.xml; } - catch (e) { + catch (exception) { return false; } } @@ -489,7 +486,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var cur_tr = $(expand_img).closest("tr[id^='viewedit-']"); while (1) { var nxt_tr = cur_tr.next(); - if (parseInt(nxt_tr.attr('level')) > level){ + if (parseInt(nxt_tr.attr('level')) > level) { cur_tr = nxt_tr; nxt_tr.hide(); } else return nxt_tr; @@ -498,12 +495,12 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ on_collapse: function(collapse_img, parent_child_id, id, main_object) { var self = this; var id = collapse_img.id.split('-')[1]; - var datas = _.detect(parent_child_id,function(res) { + var datas = _.detect(parent_child_id, function(res) { return res.key == id; }); - _.each(datas.value, function(rec) { - var tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+rec+"']"); - tr.find("img[id='parentimg-"+rec+"']").attr('src','/web/static/src/img/expand.gif'); + _.each(datas.value, function (rec) { + var tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-" + rec + "']"); + tr.find("img[id='parentimg-" + rec + "']").attr('src', '/web/static/src/img/expand.gif'); tr.show(); }); } -- cgit v1.2.3 From c5576d9a0452ca2777e871cecaabdf21c6887ddc Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Tue, 8 Nov 2011 10:41:37 +0530 Subject: [IMP] vieweditor :- give title of vieweditor dialog box. bzr revid: ysa@tinyerp.com-20111108051137-8rr281wtwm1kvcas --- addons/web/static/src/js/view_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web/static/src/js/view_editor.js') diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 9e1cbf26072..cb37b4595e1 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -253,7 +253,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var self = this; this.edit_xml_dialog = new openerp.web.Dialog(this, { modal: true, - title: 'View Editor', + title: _.sprintf("View Editor %d - %s", self.main_view_id, self.model), width: 750, height: 500, buttons: { -- cgit v1.2.3