From 614b1f6e49b31b8c0b0df5d66b308ec779b45966 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 10 Nov 2011 10:24:03 +0530 Subject: [PATCH 01/17] [IMP]add _CHILDREN dictionary for add element functionality of view editor. bzr revid: vme@tinyerp.com-20111110045403-8trt63vcqdfikelg --- addons/web/static/src/js/view_editor.js | 36 ++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 8556b82bf56..639ade0e6a4 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -336,6 +336,11 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } switch (this.id) { case "side-add": + var tr = $(this).closest("tr[id^='viewedit-']").find('a').text(); + var tag = _.detect(_.keys(_CHILDREN),function(res){ + return _.includes(tr, res); + }); + var properties = _CHILDREN[tag]; break; case "side-remove": break; @@ -473,7 +478,12 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ child_list.splice(index-1, 0, re_insert_obj[0]); } else if (move_direct == "update_node") { _.each(update_values, function(val){ - $(arch1).attr(val[0],val[1]); + if(val[0] == "required"){ + $(arch1).attr("required", "true"); + console.log(arch1); + }else{ + $(arch1).attr(val[0],val[1]); + } }); var new_obj = self.create_View_Node(arch1); new_obj.id = obj.id,new_obj.child_id = obj.child_id; @@ -548,7 +558,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ this.edit_node_dialog.$element.append('
'); this.edit_widget = []; _.each(properties, function(record) { - var id = record, + var id = record, type_widget; self.ready = $.when(self.on_groups(id)).then(function () { if (_.include(widget,id)){ @@ -562,7 +572,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ if (id == 'groups') type_widget.value = self.groups; self.edit_node_dialog.$element.find('table[id=rec_table]').append(''+id+':'+type_widget.render()+''); type_widget.start(); - type_widget.set_value(value) + type_widget.set_value(value); self.edit_widget.push(type_widget); }); }); @@ -769,6 +779,26 @@ var _PROPERTIES = { 'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'], 'view' : [], }; +_CHILDREN = { + 'form': ['notebook', 'group', 'field', 'label', 'button', 'image', 'newline', 'separator'], + 'tree': ['field'], + 'graph': ['field'], + 'calendar': ['field'], + 'notebook': ['page'], + 'page': ['notebook', 'group', 'field', 'label', 'button', 'image', 'newline', 'separator'], + 'group': ['field', 'label', 'button', 'separator', 'newline'], + 'hpaned': ['child1', 'child2'], + 'vpaned': ['child1', 'child2'], + 'child1': ['action'], + 'child2': ['action'], + 'action': [], + 'field': ['form', 'tree', 'graph'], + 'label': [], + 'button' : [], + 'image': [], + 'newline': [], + 'separator': [], +}; var icons = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD', 'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER', 'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE', From d5c21085f91cb2e360e6f769e66b9add05206d57 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 11 Nov 2011 10:47:47 +0530 Subject: [PATCH 02/17] [IMP]hide fields column in add node functionality. bzr revid: vme@tinyerp.com-20111111051747-nlswsv96o4glx6zy --- addons/web/static/src/js/view_editor.js | 57 +++++++------------------ 1 file changed, 16 insertions(+), 41 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 39738f0d20e..2008a5d2129 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -619,7 +619,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var render_list = []; render_list.push(["node_type",(_.keys(_CHILDREN)).sort()]); render_list.push(["position",positions]); - render_list.push([" ",fields]); + render_list.push(["Fields",fields]); + this.edit_widget = []; this.add_node_dialog = new openerp.web.Dialog(this,{ modal: true, title: 'Properties', @@ -627,6 +628,12 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ height: 300, buttons: { "Update": function(){ + var update_values = []; + _.each(self.edit_widget, function(widget) { + if (widget.dirty) { + update_values.push(widget.get_value()); + } + }); }, "Cancel": function(){ self.add_node_dialog.close(); @@ -639,53 +646,17 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ _.each(render_list,function(node){ type_widget = new openerp.web.ViewEditor.FieldSelect (self.add_node_dialog, node[0]); type_widget.value = node[1]; + if(node[0]=="Fields"){ node[0] = "";} table_selector.append(''+node[0]+''+type_widget.render()+''); type_widget.start(); + self.edit_widget.push(type_widget); }); table_selector.append(' '); - self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1) + self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1); + self.add_node_dialog.$element.find('#new_field').click(function() { //to do - self.Add_new_field(); }); - }, - Add_new_field : function(){ - var self = this; - var action = { - name: _.sprintf("Manage Views (%s)", this.model), - res_model: 'ir.model.fields', - views: [['form']], - type: 'ir.actions.act_window', - target: "new", - limit: this.dataset.limit || 80, - auto_search: true, - flags: { - sidebar: false, - deletable: false, - views_switcher: false, - action_buttons: false, - search_view: false, - pager: false, - radio: true - }, - }; - this.add_new_field = new openerp.web.Dialog(this, { - modal: true, - title: 'ViewEditor', - width: 750, - height: 500, - buttons: { - "Save": function(){ - //to do - }, - "Close": function(){ - self.add_new_field.close(); - } - }, - }).start().open(); - var action_manager = new openerp.web.ActionManager(this); - action_manager.appendTo(this.add_new_field); - action_manager.do_action(action); } }); openerp.web.ViewEditor.Field = openerp.web.Class.extend({ @@ -742,6 +713,10 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({ var self = this; this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() { self.on_ui_change(); + add_node = self.get_value(); + if(add_node[0] == "node_type" && add_node[1] == "field" ){ + self.$element.find("select[id=Fields]").show(); + }else{self.$element.find("select[id=Fields]").hide();} }); }, set_value: function(value) { From e6eb7c15fc49aca0c499e31071d5d2d2e39f38d8 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 11 Nov 2011 15:32:32 +0530 Subject: [PATCH 03/17] [IMP]make condition for when to update view in add node. bzr revid: vme@tinyerp.com-20111111100232-6l0rhp55dn2e53q1 --- addons/web/static/src/js/view_editor.js | 40 ++++++++++++++++--------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 376eed6fe71..578611edd5b 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -74,10 +74,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ return (node.getAttribute('name'))? _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')): _.sprintf( "<%s>",node.tagName.toLowerCase()); - }else if(node.tagName.toLowerCase() == "group"){ - return (node.getAttribute('string'))? - _.sprintf( "<%s>",node.getAttribute('string')): - _.sprintf( "<%s>",node.tagName.toLowerCase()); }else{ return (node.getAttribute('string'))? _.sprintf( "<%s string='%s'>",node.tagName.toLowerCase(), node.getAttribute('string')): @@ -338,15 +334,20 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } switch (this.id) { case "side-add": - var tr = $(this).closest("tr[id^='viewedit-']").find('a').text(); - var tag = _.detect(_.keys(_CHILDREN),function(res){ - return _.includes(tr, res); - }); + var tr = $(side).find('a').text(); + var parent_tr = ($(side).prevAll("tr[level="+String(clicked_tr_level - 1)+"]"))[0]; + parent_tr = $(parent_tr).find('a').text(); self.rpc("/web/searchview/fields_get", {model:self.model}, function(result) { var fields = _.keys(result.fields); - fields.push(" "); - fields.sort(); - self.on_add_node(_CHILDREN[tag],fields); + fields.push(" "),fields.sort(); + var property_to_check = []; + _.each([tr,parent_tr],function(element){ + property_to_check.push( + _.detect(_.keys(_CHILDREN),function(res){ + return _.includes(element, res); + })); + }); + self.on_add_node(property_to_check, fields); }); break; case "side-remove": @@ -630,10 +631,22 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ height: 300, buttons: { "Update": function(){ - var update_values = []; + var node_type,position,fields; + var check_add_node = true; _.each(self.edit_widget, function(widget) { - update_values.push(widget.get_value()); + (widget.name == "node_type")?node_type = widget.get_value()[1]:false; + (widget.name == "position")?position = widget.get_value()[1]:false; + (widget.name == "Fields")?fields = widget.get_value()[1]:false; }); + (position == "Inside")? + check_add_node =(_.include(_CHILDREN[properties[0]],node_type))?true:false: + check_add_node =(_.include(_CHILDREN[properties[1]],node_type))?true:false; + if(node_type == "field" && check_add_node ) + {check_add_node = (fields != " ")?true:false; + } + if(check_add_node){ + var tag = _.sprintf("<%s>",node_type,node_type); + }else{alert("Can't Update View");} }, "Cancel": function(){ self.add_node_dialog.close(); @@ -653,7 +666,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); table_selector.append(' '); self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1); - self.add_node_dialog.$element.find('#new_field').click(function() { //to do }); From 81e8bce5a1625e33b380549a37389690ae86dd62 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 11 Nov 2011 19:00:02 +0530 Subject: [PATCH 04/17] [IMP]add node to xml according to its position. bzr revid: vme@tinyerp.com-20111111133002-5shh06ts8vjumhqo --- addons/web/static/src/js/view_editor.js | 39 ++++++++++++++++++++----- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index d1ed9cbf867..f85d44710f2 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -70,6 +70,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); }, add_node_name : function(node) { + console.log("node",node); if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){ return (node.getAttribute('name'))? _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')): @@ -347,7 +348,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ return _.includes(element, res); })); }); - self.on_add_node(property_to_check, fields); + self.on_add_node(property_to_check, fields , + clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); }); break; case "side-remove": @@ -491,19 +493,35 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }else{ $(arch1).attr(val[0],val[1]); } + console.log("typeof",typeof arch1,arch1); }); var new_obj = self.create_View_Node(arch1); new_obj.id = obj.id,new_obj.child_id = obj.child_id; self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name); child_list.splice(index, 1, new_obj); + }else if(move_direct == "add_node"){ + console.log(arch1,obj, update_values); + $(arch1).add(update_values[0]); + //self.create_View_Node(arch1); object not created here + switch (update_values[1]) { + case "After": + $(arch1).after(update_values[0]); + break; + case "Before": + $(arch1).before(update_values[0]); + break; + case "Inside": + $(arch1).append(update_values[0]); + break; + } } var parent = $(arch1).parents(); var convert_to_utf = QWeb.tools.xml_node_to_string(parent[parent.length-1]); 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; - this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { - }); + /*this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { + });*/ } if (obj.level <= level) { _.each(list_obj_xml, function(child_node) { @@ -616,8 +634,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }) return def.promise(); }, - on_add_node: function(properties,fields){ + on_add_node: function(properties,fields,clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level){ var self = this; + console.log() var positions = ['After','Before','Inside']; var render_list = []; render_list.push(["node_type",(_.keys(_CHILDREN)).sort()]); @@ -631,21 +650,25 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ height: 300, buttons: { "Update": function(){ - var node_type,position,fields; + var node_type,position,field_value; var check_add_node = true; _.each(self.edit_widget, function(widget) { (widget.name == "node_type")?node_type = widget.get_value()[1]:false; (widget.name == "position")?position = widget.get_value()[1]:false; - (widget.name == "Fields")?fields = widget.get_value()[1]:false; + (widget.name == "Fields")?field_value = widget.get_value()[1]:false; }); (position == "Inside")? check_add_node =(_.include(_CHILDREN[properties[0]],node_type))?true:false: check_add_node =(_.include(_CHILDREN[properties[1]],node_type))?true:false; if(node_type == "field" && check_add_node ) - {check_add_node = (fields != " ")?true:false; + {check_add_node = (field_value != " ")?true:false; } if(check_add_node){ - var tag = _.sprintf("<%s>",node_type,node_type); + var tag = (node_type == "field")? + _.sprintf("<%s name='%s'> ",node_type,field_value,node_type): + _.sprintf("<%s>",node_type,node_type); + self.do_save_update_arch(one_object, view_id, view_xml_id, + clicked_tr_id, clicked_tr_level, "add_node", [tag, position]); }else{alert("Can't Update View");} }, "Cancel": function(){ From cf75acd81327dc93af2e129aa7ccdf717bac8113 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 14 Nov 2011 11:58:41 +0530 Subject: [PATCH 05/17] [IMP]creating and saving new node in view editor. bzr revid: vme@tinyerp.com-20111114062841-l3dwhedz0n3fm2in --- addons/web/static/src/js/view_editor.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index f85d44710f2..1dfbc593461 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -70,7 +70,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); }, add_node_name : function(node) { - console.log("node",node); if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){ return (node.getAttribute('name'))? _.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')): @@ -493,25 +492,30 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }else{ $(arch1).attr(val[0],val[1]); } - console.log("typeof",typeof arch1,arch1); }); var new_obj = self.create_View_Node(arch1); new_obj.id = obj.id,new_obj.child_id = obj.child_id; self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name); child_list.splice(index, 1, new_obj); }else if(move_direct == "add_node"){ - console.log(arch1,obj, update_values); $(arch1).add(update_values[0]); - //self.create_View_Node(arch1); object not created here + var temp_xml = QWeb.load_xml(update_values[0]); + var object_xml = self.create_View_Node(temp_xml.childNodes[0]); switch (update_values[1]) { case "After": + object_xml.level = obj.level; $(arch1).after(update_values[0]); + child_list.splice(index + 1, 0, object_xml); break; case "Before": + object_xml.level = obj.level; $(arch1).before(update_values[0]); + child_list.splice(index - 1, 0, object_xml); break; case "Inside": + object_xml.level = obj.level + 1; $(arch1).append(update_values[0]); + obj.child_id.push(object_xml); break; } } @@ -520,8 +524,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 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; - /*this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { - });*/ + this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { + }); } if (obj.level <= level) { _.each(list_obj_xml, function(child_node) { @@ -636,7 +640,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }, on_add_node: function(properties,fields,clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level){ var self = this; - console.log() var positions = ['After','Before','Inside']; var render_list = []; render_list.push(["node_type",(_.keys(_CHILDREN)).sort()]); @@ -665,8 +668,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } if(check_add_node){ var tag = (node_type == "field")? - _.sprintf("<%s name='%s'> ",node_type,field_value,node_type): - _.sprintf("<%s>",node_type,node_type); + _.sprintf("<%s name='%s'> ",node_type,field_value,node_type): + _.sprintf("<%s> ",node_type,node_type); self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "add_node", [tag, position]); }else{alert("Can't Update View");} From cdd20ff94cff6b466b6b6baaab34a2d60356db7a Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 14 Nov 2011 14:11:23 +0530 Subject: [PATCH 06/17] [imp]Rendered new fields view. bzr revid: vme@tinyerp.com-20111114084123-el9szj2v0ukrcfqt --- addons/web/static/src/js/view_editor.js | 32 +++++++++++++++++-------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 1dfbc593461..82c7be4745d 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -498,24 +498,15 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name); child_list.splice(index, 1, new_obj); }else if(move_direct == "add_node"){ - $(arch1).add(update_values[0]); - var temp_xml = QWeb.load_xml(update_values[0]); - var object_xml = self.create_View_Node(temp_xml.childNodes[0]); switch (update_values[1]) { case "After": - object_xml.level = obj.level; $(arch1).after(update_values[0]); - child_list.splice(index + 1, 0, object_xml); break; case "Before": - object_xml.level = obj.level; $(arch1).before(update_values[0]); - child_list.splice(index - 1, 0, object_xml); break; case "Inside": - object_xml.level = obj.level + 1; $(arch1).append(update_values[0]); - obj.child_id.push(object_xml); break; } } @@ -526,6 +517,11 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ arch.arch = convert_to_utf; this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { }); + if(move_direct == "add_node"){ + self.add_node_dialog.close(); + self.edit_xml_dialog.close(); + self.xml_element_id = 0; + self.get_arch();} } if (obj.level <= level) { _.each(list_obj_xml, function(child_node) { @@ -693,7 +689,23 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ table_selector.append(' '); self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1); self.add_node_dialog.$element.find('#new_field').click(function() { - //to do + var action = { + context: self.session.user_context, + res_model: "ir.model.fields", + views: [[false, 'form']], + type: 'ir.actions.act_window', + target: "new", + flags: { + sidebar: false, + views_switcher: false, + action_buttons: false, + search_view: false, + pager: false, + }, + }; + var action_manager = new openerp.web.ActionManager(self); + action_manager.do_action(action); + }); } }); From 7b8798df9caaeb65a38ae24e1da8eda3eb4bb7dd Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 14 Nov 2011 15:40:31 +0530 Subject: [PATCH 07/17] [IMP]corrent value for field type and model. bzr revid: vme@tinyerp.com-20111114101031-ltmfz1786jcqfo0q --- addons/web/static/src/js/view_editor.js | 39 +++++++++++++------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 82c7be4745d..cc9f6051462 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -5,7 +5,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ this._super(parent); this.element_id = element_id this.parent = parent - this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null); + this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null), this.model = dataset.model; this.xml_element_id = 0; this.property = openerp.web.ViewEditor.property_widget; @@ -689,24 +689,27 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ table_selector.append(' '); self.add_node_dialog.$element.find("select[id=node_type] option[value=field]").attr("selected",1); self.add_node_dialog.$element.find('#new_field').click(function() { - var action = { - context: self.session.user_context, - res_model: "ir.model.fields", - views: [[false, 'form']], - type: 'ir.actions.act_window', - target: "new", - flags: { - sidebar: false, - views_switcher: false, - action_buttons: false, - search_view: false, - pager: false, - }, - }; - var action_manager = new openerp.web.ActionManager(self); - action_manager.do_action(action); - + model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null); + model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) { + self.render_new_field(result[0].id); + }); }); + }, + render_new_field :function(id){ + var action = { + context: {'default_model_id':id, 'manual':true},//self.session.user_context, + res_model: "ir.model.fields", + views: [[false, 'form']], + type: 'ir.actions.act_window', + target: "new", + flags: { + action_buttons: true, + }, + }; + var action_manager = new openerp.web.ActionManager(self); + action_manager.do_action(action); + }); + } }); openerp.web.ViewEditor.Field = openerp.web.Class.extend({ From 915ec137ab90a38caaea81eb808345640aff891d Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 15 Nov 2011 17:44:34 +0530 Subject: [PATCH 08/17] [IMP] implement code for remove element in view editor. bzr revid: vme@tinyerp.com-20111115121434-u0x8pf6nf9clcp6r --- addons/web/static/src/js/view_editor.js | 35 ++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 4dc4eab5301..9f89ac0314b 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -459,6 +459,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); break; case "side-remove": + self.do_save_update_arch + (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node"); break; case "side-edit": var tr = $(this).closest("tr[id^='viewedit-']").find('a').text(); @@ -591,11 +593,13 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ $(next).after(arch1); var re_insert_obj = child_list.splice(index, 1); child_list.splice(index+1, 0, re_insert_obj[0]); + var parent = $(arch1).parents(); } else if (move_direct == "up") { var prev = $(arch1).prev(); $(prev).before(arch1); var re_insert_obj = child_list.splice(index, 1); child_list.splice(index-1, 0, re_insert_obj[0]); + var parent = $(arch1).parents(); } else if (move_direct == "update_node") { _.each(update_values, function(val){ if(val[0] == "required"){ @@ -608,6 +612,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ new_obj.id = obj.id,new_obj.child_id = obj.child_id; self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name); child_list.splice(index, 1, new_obj); + var parent = $(arch1).parents(); }else if(move_direct == "add_node"){ switch (update_values[1]) { case "After": @@ -620,8 +625,17 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ $(arch1).append(update_values[0]); break; } + var parent = $(arch1).parents(); + }else if(move_direct == "remove_node"){ + var parent = $(arch1).parents(); + $(arch1).remove(); + child_list.splice(index,1); + var cur_tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']"); + _.each(self.get_list_tr(cur_tr,obj.level), function(tr_element){ + tr_element.remove(); + }); + cur_tr.remove(); } - var parent = $(arch1).parents(); var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1; convert_to_utf = QWeb.tools.xml_node_to_string(convert_to_utf); convert_to_utf = convert_to_utf.replace('xmlns="http://www.w3.org/1999/xhtml"', ""); @@ -645,12 +659,18 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ on_expand: function(expand_img){ var level = parseInt($(expand_img).closest("tr[id^='viewedit-']").attr('level')); var cur_tr = $(expand_img).closest("tr[id^='viewedit-']"); + _.each(this.get_list_tr(cur_tr,level), function(tr_element){ + tr_element.hide(); + }); + }, + get_list_tr: function(cur_tr,level){ + tr_list = []; while (1) { var nxt_tr = cur_tr.next(); if (parseInt(nxt_tr.attr('level')) > level) { cur_tr = nxt_tr; - nxt_tr.hide(); - } else return nxt_tr; + tr_list.push(nxt_tr); + } else return tr_list; } }, on_collapse: function(collapse_img, parent_child_id, id, main_object) { @@ -807,7 +827,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }, render_new_field :function(id){ var action = { - context: {'default_model_id':id, 'manual':true},//self.session.user_context, + context: {'default_model_id':id, 'manual':true}, res_model: "ir.model.fields", views: [[false, 'form']], type: 'ir.actions.act_window', @@ -818,6 +838,13 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } var action_manager = new openerp.web.ActionManager(self); action_manager.do_action(action); + $.when(action_manager.do_action(action)).then(function() { + var add_controller = action_manager.dialog_viewmanager.views['form'].controller; + add_controller.do_set_readonly.add_last(function(){ + var aa = controller; + }); + }); + } }); openerp.web.ViewEditor.Field = openerp.web.Class.extend({ From 5ed7d8a8c262cb32a127c92b8b754d36128f5f16 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Wed, 16 Nov 2011 13:14:41 +0530 Subject: [PATCH 09/17] [IMP]improve code for remove view in remove node functionality. bzr revid: vme@tinyerp.com-20111116074441-eduxxr9o2ceno92h --- addons/web/static/src/js/view_editor.js | 57 ++++++++++++++++--------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 9f89ac0314b..b4ca58eb8ee 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -415,7 +415,7 @@ 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 clicked_tr_id = (side.attr('id')).split('-')[1]; + var clicked_tr_id = parseInt((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; @@ -427,16 +427,24 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var view_xml_id; var view_find = side; var min_level = clicked_tr_level; - 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')) < min_level ) { - view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); - view_xml_id = (view_find.attr('id')).split('-')[1]; - break; - } - if(view_find.attr('level') < min_level){ - min_level = parseInt(view_find.attr('level')); + if(($(side).find('a').text()).search("view_id") != -1){ + view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); + view_xml_id = (view_find.attr('id')).split('-')[1]; + clicked_tr_id += 1; + clicked_tr_level += 1; + }else{ + while (1) { + view_find = view_find.prev(); + if (view_find.length == 0 || + (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1 + && parseInt(view_find.attr('level')) < min_level ) { + view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); + view_xml_id = (view_find.attr('id')).split('-')[1]; + break; + } + if(view_find.attr('level') < min_level){ + min_level = parseInt(view_find.attr('level')); + } } } switch (this.id) { @@ -563,6 +571,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ arch_to_pass = _.filter($(arch.arch), function (child) { return child.nodeType == 1; }); + return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0], parseInt(clicked_tr_id), [], parseInt(clicked_tr_level), parseInt(view_id), arch, move_direct, update_values); @@ -628,21 +637,31 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var parent = $(arch1).parents(); }else if(move_direct == "remove_node"){ var parent = $(arch1).parents(); + if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){ + id = id -1; + level = level - 1; + (parent.length == 0)?parent.push("remove_view"):false; + } $(arch1).remove(); child_list.splice(index,1); - var cur_tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']"); - _.each(self.get_list_tr(cur_tr,obj.level), function(tr_element){ + var cur_tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id +"']"); + _.each(self.get_list_tr(cur_tr,level), function(tr_element){ tr_element.remove(); }); cur_tr.remove(); } var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1; - convert_to_utf = QWeb.tools.xml_node_to_string(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; - this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { - }); + if(convert_to_utf != "remove_view"){ + convert_to_utf = QWeb.tools.xml_node_to_string(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; + /*this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { + });*/ + }else{ + /*this.dataset.unlink([parseInt(view_id)],function(res) { + });*/ + } if(move_direct == "add_node"){ self.add_node_dialog.close(); self.edit_xml_dialog.close(); From a03506d84a45429dcfade2e33625dcadd0a554ad Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Wed, 16 Nov 2011 14:34:21 +0530 Subject: [PATCH 10/17] [IMP]improve code in view editor. bzr revid: vme@tinyerp.com-20111116090421-qri7wmviyiygoxlo --- addons/web/static/src/js/view_editor.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index b4ca58eb8ee..77d61a2d228 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -467,8 +467,10 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); break; case "side-remove": - self.do_save_update_arch - (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node"); + if (confirm(_t("Do you really want to remove this node?"))) { + self.do_save_update_arch + (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node"); + } break; case "side-edit": var tr = $(this).closest("tr[id^='viewedit-']").find('a').text(); @@ -656,11 +658,11 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 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; - /*this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { - });*/ + this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { + }); }else{ - /*this.dataset.unlink([parseInt(view_id)],function(res) { - });*/ + this.dataset.unlink([parseInt(view_id)],function(res) { + }); } if(move_direct == "add_node"){ self.add_node_dialog.close(); From d272f9d03b03049da42378fce434c4713f613eb6 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 17 Nov 2011 12:25:25 +0530 Subject: [PATCH 11/17] [IMP] implement functionlity of new field add. bzr revid: vme@tinyerp.com-20111117065525-60ooggze1xh38v63 --- addons/web/static/src/js/view_editor.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 77d61a2d228..8ebd617e0c2 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -847,6 +847,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); }, render_new_field :function(id){ + var self = this; var action = { context: {'default_model_id':id, 'manual':true}, res_model: "ir.model.fields", @@ -858,14 +859,21 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } } var action_manager = new openerp.web.ActionManager(self); - action_manager.do_action(action); $.when(action_manager.do_action(action)).then(function() { - var add_controller = action_manager.dialog_viewmanager.views['form'].controller; - add_controller.do_set_readonly.add_last(function(){ - var aa = controller; + var controller = action_manager.dialog_viewmanager.views['form'].controller; + controller.do_set_readonly.add_last(function(){ + action_manager.stop(); + new_fields_name = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null); + new_fields_name.read_ids([controller.datarecord.id], ['name'], function(result) { + self.add_node_dialog.$element. + find('select[id=field_value]'). append($(""). + attr("value",result[0].name).text(result[0].name)); + _.detect(self.add_widget,function(widget){ + (widget.name == "field_value")?widget.selection.push(result[0].name):false; + }); + }); }); }); - } }); openerp.web.ViewEditor.Field = openerp.web.Class.extend({ From 379c9fab24836c91b42e216afa7371f2533785e3 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 18 Nov 2011 11:29:03 +0530 Subject: [PATCH 12/17] [IMP]code refactor. bzr revid: vme@tinyerp.com-20111118055903-llouzhuhdw5j64mh --- addons/web/static/src/js/view_editor.js | 74 ++++++++++++++++++------- 1 file changed, 55 insertions(+), 19 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 8ebd617e0c2..af73b3c31fa 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -10,6 +10,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ this.model = dataset.model; this.xml_element_id = 0; this.property = openerp.web.ViewEditor.property_widget; + this.one_object; }, start: function() { this.init_view_editor(); @@ -402,6 +403,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 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'); + console.log(self); }); this.edit_xml_dialog.$element.find("img[id^='parentimg-']").click(function() { if ($(this).attr('src') == '/web/static/src/img/collapse.gif') { @@ -414,6 +416,11 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }); this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() { + + }); + }, + what_to_do: function(){ + var self = this; var side = $(this).closest("tr[id^='viewedit-']"); var clicked_tr_id = parseInt((side.attr('id')).split('-')[1]); var img = side.find("img[id='parentimg-" + clicked_tr_id + "']").attr('src'); @@ -468,6 +475,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ break; case "side-remove": if (confirm(_t("Do you really want to remove this node?"))) { + self.do_save_update_arch (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node"); } @@ -478,6 +486,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ return _.includes(tr, res); }); var properties = _PROPERTIES[tag]; + console.log("properties",properties); self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); break; case "side-up": @@ -508,7 +517,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ _.each(tr_to_move, function(rec) { $(last_tr).before(rec); }); - self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up"); + self.do_save_update_arch + (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up"); } break; case "side-down": @@ -551,8 +561,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } break; } - }); - }, + } + + do_save_update_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, move_direct, update_values) { var self = this; var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;}); @@ -625,7 +636,16 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ child_list.splice(index, 1, new_obj); var parent = $(arch1).parents(); }else if(move_direct == "add_node"){ - switch (update_values[1]) { + //not working + var clone = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").clone(); + self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").after(clone); + clone.find("img[id^='side-']").click(function(){ + console.log("this",this); + }); + clone.bind("click", function(){ + console.log("thissss",this); + }); + switch (update_values[1]) { case "After": $(arch1).after(update_values[0]); break; @@ -639,6 +659,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var parent = $(arch1).parents(); }else if(move_direct == "remove_node"){ var parent = $(arch1).parents(); + console.log("vidhin",obj); if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){ id = id -1; level = level - 1; @@ -665,10 +686,11 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); } if(move_direct == "add_node"){ - self.add_node_dialog.close(); - self.edit_xml_dialog.close(); - self.xml_element_id = 0; - self.get_arch();} + //self.add_node_dialog.close(); + //self.edit_xml_dialog.close(); + //self.xml_element_id = 0; + //self.get_arch(id); + } } if (obj.level <= level) { _.each(list_obj_xml, function(child_node) { @@ -793,14 +815,14 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var render_list = []; var render_list =[{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type'}, - {'name': 'position','selection': positions, 'value': false, 'string': 'Position'}, - {'name': 'field_value','selection': fields, 'value': false, 'string': ''}]; + {'name': 'field_value','selection': fields, 'value': false, 'string': ''}, + {'name': 'position','selection': positions, 'value': false, 'string': 'Position'}]; this.add_widget = []; this.add_node_dialog = new openerp.web.Dialog(this,{ modal: true, title: 'Properties', - width: 500, - height: 300, + width: 430, + height: 190, buttons: { "Update": function(){ var check_add_node = true; @@ -828,17 +850,27 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }).start().open(); this.add_node_dialog.$element. - append('
'); - var table_selector = self.add_node_dialog.$element.find('table[id=rec_table]'); + append('
'); + var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody'); _.each(render_list,function(node){ type_widget = new openerp.web.ViewEditor.FieldSelect (self.add_node_dialog, node.name); type_widget.selection = node.selection; - table_selector.append('' + node.string + ':' + type_widget.render() + ''); + if(node.name == "position"){ + table_selector.append + ('' + node.string + ':' + type_widget.render() + ''); + }else{ + table_selector.append + ('' + node.string + '' + type_widget.render()); + if(node.name == "field_value"){ + table_selector.append + (' '); + } + } type_widget.start(); type_widget.set_value(node.value); self.add_widget.push(type_widget); }); - table_selector.append(' '); + table_selector.find("td").attr("width","100px"); self.add_node_dialog.$element.find('#new_field').click(function() { model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null); model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) { @@ -953,9 +985,13 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({ this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() { self.on_ui_change(); if(self.name == "node_type"){ - (self.get_value() == "field")? - self.$element.find("select[id=field_value]").show(): - self.$element.find("select[id=field_value]").hide(); + if(self.get_value() == "field"){ + self.$element.find('#new_field').show(); + self.$element.find("select[id=field_value]").show(); + }else{ + self.$element.find('#new_field').hide(); + self.$element.find("select[id=field_value]").hide(); + } } }); From 2f13563b21865f8354b1998bbb717c52e40eb02a Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 18 Nov 2011 18:57:35 +0530 Subject: [PATCH 13/17] [IMP]add event for clone element. bzr revid: vme@tinyerp.com-20111118132735-35gkiai7l4oq0pin --- addons/web/static/src/js/view_editor.js | 417 +++++++++++++----------- 1 file changed, 220 insertions(+), 197 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index af73b3c31fa..547b6e582f5 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -363,8 +363,23 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ self.increase_level(val, level + 1); }); }, + do_select_row: function(id){ + this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").removeClass('ui-selected'); + this.edit_xml_dialog.$element.find("tr[id=viewedit-"+id+"]").addClass('ui-selected'); + }, + do_parent_img_hide_show: function(img){ + var self = this; + if ($(img).attr('src') == '/web/static/src/img/collapse.gif') { + $(img).attr('src', '/web/static/src/img/expand.gif'); + self.on_expand(img); + } else { + $(img).attr('src', '/web/static/src/img/collapse.gif'); + this.on_collapse(img); + } + }, edit_view: function(one_object) { var self = this; + this.one_object = one_object; this.edit_xml_dialog = new openerp.web.Dialog(this, { modal: true, title: _.sprintf("View Editor %d - %s", self.main_view_id, self.model), @@ -395,175 +410,187 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } } }).start().open(); + var no_property_att = []; _.each(_PROPERTIES, function(val, key) { if (! val.length) no_property_att.push(key); }); + this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {'data': one_object['main_object'], 'no_properties': no_property_att})); + 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'); - console.log(self); + self.do_select_row(this.id.split('-')[1]); }); + this.edit_xml_dialog.$element.find("img[id^='parentimg-']").click(function() { - if ($(this).attr('src') == '/web/static/src/img/collapse.gif') { - $(this).attr('src', '/web/static/src/img/expand.gif'); - self.on_expand(this); - } else { - $(this).attr('src', '/web/static/src/img/collapse.gif'); - var id = this.id.split('-')[1]; - self.on_collapse(this,one_object['parent_child_id'], one_object['main_object']); - } + self.do_parent_img_hide_show(this); }); this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() { - + self.on_select_img(this); }); }, - what_to_do: function(){ - var self = this; - var side = $(this).closest("tr[id^='viewedit-']"); - var clicked_tr_id = parseInt((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; - var last_tr; - var next_tr; - var tr_to_move = []; - tr_to_move.push(side); - var view_id; - var view_xml_id; - var view_find = side; - var min_level = clicked_tr_level; - if(($(side).find('a').text()).search("view_id") != -1){ - view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); - view_xml_id = (view_find.attr('id')).split('-')[1]; - clicked_tr_id += 1; - clicked_tr_level += 1; - }else{ - while (1) { - view_find = view_find.prev(); - if (view_find.length == 0 || - (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1 - && parseInt(view_find.attr('level')) < min_level ) { - view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); - view_xml_id = (view_find.attr('id')).split('-')[1]; - break; - } - if(view_find.attr('level') < min_level){ - min_level = parseInt(view_find.attr('level')); - } + + on_select_img: function(element_img){ + var self = this; + var side = $(element_img).closest("tr[id^='viewedit-']"); + this.one_object.clicked_tr_id = parseInt((side.attr('id')).split('-')[1]); + this.one_object.clicked_tr_level = parseInt(side.attr('level')); + var img = side.find("img[id='parentimg-" + this.one_object.clicked_tr_id + "']").attr('src'); + var view_id,view_xml_id; + var view_find = side; + + //for view id found + var min_level = this.one_object.clicked_tr_id; + if(($(side).find('a').text()).search("view_id") != -1){ + view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); + view_xml_id = (view_find.attr('id')).split('-')[1]; + this.one_object.clicked_tr_id += 1; + this.one_object.clicked_tr_level += 1; + }else{ + while (1) { + view_find = view_find.prev(); + if (view_find.length == 0 || + (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1 + && parseInt(view_find.attr('level')) < min_level ) { + view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); + view_xml_id = (view_find.attr('id')).split('-')[1]; + break; + } + if(view_find.attr('level') < min_level){ + min_level = parseInt(view_find.attr('level')); } } - switch (this.id) { - case "side-add": - var tr = $(side).find('a').text(); - var parent_tr = ($(side).prevAll("tr[level="+String(clicked_tr_level - 1)+"]"))[0]; - parent_tr = $(parent_tr).find('a').text(); - self.rpc("/web/searchview/fields_get", {model:self.model}, function(result) { - var fields = _.keys(result.fields); - fields.push(" "),fields.sort(); - var property_to_check = []; - _.each([tr,parent_tr],function(element){ - property_to_check.push( - _.detect(_.keys(_CHILDREN),function(res){ - return _.includes(element, res); - })); - }); - self.on_add_node(property_to_check, fields , - clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); - }); - break; - case "side-remove": - if (confirm(_t("Do you really want to remove this node?"))) { - - self.do_save_update_arch - (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node"); - } - break; - case "side-edit": - var tr = $(this).closest("tr[id^='viewedit-']").find('a').text(); - var tag = _.detect(_.keys(_PROPERTIES),function(res){ - return _.includes(tr, res); - }); - var properties = _PROPERTIES[tag]; - console.log("properties",properties); - self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); - break; - case "side-up": - while (1) { - var prev_tr = cur_tr.prev(); - 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-" + clicked_tr_id + "']"). - 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) { - break; - } else { - next_tr.hide(); - tr_to_move.push(next_tr); - side = next_tr; - } - } - } - 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); - }); - self.do_save_update_arch - (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up"); - } + } + this.one_object.clicked_tr_view = [view_id, view_xml_id]; + switch (element_img.id) { + case "side-add": + self.do_node_add(side); + break; + case "side-remove": + if (confirm(_t("Do you really want to remove this node?"))) { + self.do_save_update_arch + (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node"); + } + break; + case "side-edit": + self.do_node_edit(side); + break; + case "side-up": + self.do_node_up(side, img); break; case "side-down": - if (img) { - while (1) { - next_tr = cur_tr.next(); - if ( parseInt(next_tr.attr('level')) <= clicked_tr_level || next_tr.length == 0) { - last_tr = next_tr; - break; - } else { - tr_to_move.push(next_tr); - cur_tr = next_tr; - } - } - } else { - last_tr = cur_tr.next(); - } - - 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) { - var last_tr_id = (last_tr.attr('id')).split('-')[1]; - img = last_tr.find("img[id='parentimg-" + last_tr_id + "']").attr('src'); - if (img) { - self.edit_xml_dialog.$element.find("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') <= clicked_tr_level || next_tr.length == 0) break; - next_tr.hide(); - last_tr = next_tr; - } - } - tr_to_move.reverse(); - _.each(tr_to_move, function(rec) { - $(last_tr).after(rec); - }); - self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "down"); - } + self.do_node_down(side, img); break; + } + }, + do_node_add: function(side){ + var self = this; + var tr = $(side).find('a').text(); + var parent_tr = ($(side).prevAll("tr[level="+String(this.one_object.clicked_tr_level - 1)+"]"))[0]; + parent_tr = $(parent_tr).find('a').text(); + self.rpc("/web/searchview/fields_get", {model:self.model}, function(result) { + var fields = _.keys(result.fields); + fields.push(" "),fields.sort(); + var property_to_check = []; + _.each([tr,parent_tr],function(element){ + property_to_check.push( + _.detect(_.keys(_CHILDREN),function(res){ + return _.includes(element, res); + })); + }); + console.log(property_to_check,fields); + //self.on_add_node(property_to_check, fields , + // clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); + }); + }, + do_node_edit: function(side){ + var self = this; + var tr = $(side).find('a').text(); + var tag = _.detect(_.keys(_PROPERTIES),function(res){ + return _.includes(tr, res); + }); + var properties = _PROPERTIES[tag]; + console.log(properties); + //self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); + }, + do_node_down: function(cur_tr, img){ + var self = this; + var next_tr,last_tr; + tr_to_move=[]; + tr_to_move.push(cur_tr); + if (img) { + while (1) { + next_tr = cur_tr.next(); + if ( parseInt(next_tr.attr('level')) <= this.one_object.clicked_tr_level || next_tr.length == 0) { + last_tr = next_tr; + break; + } else { + tr_to_move.push(next_tr); + cur_tr = next_tr; + } + } + } else { + last_tr = cur_tr.next(); + } + + 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')) == this.one_object.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) { + self.edit_xml_dialog.$element.find("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') <= this.one_object.clicked_tr_level || next_tr.length == 0) break; + next_tr.hide(); + last_tr = next_tr; + } } - } - - + tr_to_move.reverse(); + _.each(tr_to_move, function(rec) { + $(last_tr).after(rec); + }); + // self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "down"); + } + }, + do_node_up: function(cur_tr, img){ + var self = this; + var side = cur_tr; + tr_to_move=[]; + tr_to_move.push(side); + while (1) { + var prev_tr = cur_tr.prev(); + if (this.one_object.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-" + this.one_object.clicked_tr_id + "']"). + attr('src', '/web/static/src/img/expand.gif'); + while (1) { + next_tr = side.next(); + if (parseInt(next_tr.attr('level')) <= this.one_object.clicked_tr_level || next_tr.length == 0) { + break; + } else { + next_tr.hide(); + tr_to_move.push(next_tr); + side = next_tr; + } + } + } + if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == this.one_object.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); + }); + //self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up"); + } + }, do_save_update_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, move_direct, update_values) { var self = this; var arch = _.detect(one_object['arch'], function(element) {return element.view_id == view_id;}); @@ -636,30 +663,41 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ child_list.splice(index, 1, new_obj); var parent = $(arch1).parents(); }else if(move_direct == "add_node"){ - //not working - var clone = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").clone(); - self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").after(clone); - clone.find("img[id^='side-']").click(function(){ - console.log("this",this); - }); - clone.bind("click", function(){ - console.log("thissss",this); - }); - switch (update_values[1]) { - case "After": + var temp_xml = QWeb.load_xml(update_values[0]); + var object_xml = self.create_View_Node(temp_xml.childNodes[0]); + var clone = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").clone(); + clone.find('a').text(object_xml.name); + clone.attr("id","viewedit-" + object_xml.id ); + clone.bind("click",function(){ + self.do_select_row(object_xml.id); + }); + clone.find("img[id^='side-']").click(function() { + self.on_select_img(this); + }); + clone.find("img[id^='parentimg-']").click(function() { + self.do_parent_img_hide_show(this); + }); + switch (update_values[1]) { + case "After": + object_xml.level = obj.level; $(arch1).after(update_values[0]); + child_list.splice(index + 1, 0, object_xml); break; case "Before": + object_xml.level = obj.level; $(arch1).before(update_values[0]); + child_list.splice(index - 1, 0, object_xml); break; case "Inside": + object_xml.level = obj.level + 1; $(arch1).append(update_values[0]); + obj.child_id.push(object_xml); break; - } + } + self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").after(clone); var parent = $(arch1).parents(); }else if(move_direct == "remove_node"){ var parent = $(arch1).parents(); - console.log("vidhin",obj); if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){ id = id -1; level = level - 1; @@ -674,7 +712,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ cur_tr.remove(); } var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1; - if(convert_to_utf != "remove_view"){ + /*if(convert_to_utf != "remove_view"){ convert_to_utf = QWeb.tools.xml_node_to_string(convert_to_utf); convert_to_utf = convert_to_utf.replace('xmlns="http://www.w3.org/1999/xhtml"', ""); convert_to_utf = '' + convert_to_utf; @@ -686,11 +724,10 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); } if(move_direct == "add_node"){ - //self.add_node_dialog.close(); - //self.edit_xml_dialog.close(); - //self.xml_element_id = 0; - //self.get_arch(id); - } + self.add_node_dialog.close(); + self.edit_xml_dialog.close(); + self.xml_element_id = 0; + self.get_arch();}*/ } if (obj.level <= level) { _.each(list_obj_xml, function(child_node) { @@ -716,10 +753,10 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } else return tr_list; } }, - on_collapse: function(collapse_img, parent_child_id, id, main_object) { + on_collapse: function(collapse_img) { var self = this; var id = collapse_img.id.split('-')[1]; - var datas = _.detect(parent_child_id, function(res) { + var datas = _.detect(self.one_object['parent_child_id'] , function(res) { return res.key == id; }); _.each(datas.value, function (rec) { @@ -815,14 +852,14 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var render_list = []; var render_list =[{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type'}, - {'name': 'field_value','selection': fields, 'value': false, 'string': ''}, - {'name': 'position','selection': positions, 'value': false, 'string': 'Position'}]; + {'name': 'position','selection': positions, 'value': false, 'string': 'Position'}, + {'name': 'field_value','selection': fields, 'value': false, 'string': ''}]; this.add_widget = []; this.add_node_dialog = new openerp.web.Dialog(this,{ modal: true, title: 'Properties', - width: 430, - height: 190, + width: 500, + height: 300, buttons: { "Update": function(){ var check_add_node = true; @@ -850,27 +887,17 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }).start().open(); this.add_node_dialog.$element. - append('
'); - var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody'); + append('
'); + var table_selector = self.add_node_dialog.$element.find('table[id=rec_table]'); _.each(render_list,function(node){ type_widget = new openerp.web.ViewEditor.FieldSelect (self.add_node_dialog, node.name); type_widget.selection = node.selection; - if(node.name == "position"){ - table_selector.append - ('' + node.string + ':' + type_widget.render() + ''); - }else{ - table_selector.append - ('' + node.string + '' + type_widget.render()); - if(node.name == "field_value"){ - table_selector.append - (' '); - } - } + table_selector.append('' + node.string + ':' + type_widget.render() + ''); type_widget.start(); type_widget.set_value(node.value); self.add_widget.push(type_widget); }); - table_selector.find("td").attr("width","100px"); + table_selector.append(' '); self.add_node_dialog.$element.find('#new_field').click(function() { model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null); model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) { @@ -985,13 +1012,9 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({ this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() { self.on_ui_change(); if(self.name == "node_type"){ - if(self.get_value() == "field"){ - self.$element.find('#new_field').show(); - self.$element.find("select[id=field_value]").show(); - }else{ - self.$element.find('#new_field').hide(); - self.$element.find("select[id=field_value]").hide(); - } + (self.get_value() == "field")? + self.$element.find("select[id=field_value]").show(): + self.$element.find("select[id=field_value]").hide(); } }); From 96212584c4a1e07aee66b5dfb0e64fa5fbafcaca Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 21 Nov 2011 15:43:26 +0530 Subject: [PATCH 14/17] [IMP]make sequence for add node and edit node dialog box. bzr revid: vme@tinyerp.com-20111121101326-xyhlum8idixqgkhr --- addons/web/static/src/js/view_editor.js | 139 +++++++++++++----------- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 77 insertions(+), 64 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 547b6e582f5..f578d9da006 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -432,6 +432,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ on_select_img: function(element_img){ var self = this; + console.log("kooooo",element_img); var side = $(element_img).closest("tr[id^='viewedit-']"); this.one_object.clicked_tr_id = parseInt((side.attr('id')).split('-')[1]); this.one_object.clicked_tr_level = parseInt(side.attr('level')); @@ -453,7 +454,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1 && parseInt(view_find.attr('level')) < min_level ) { view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); - view_xml_id = (view_find.attr('id')).split('-')[1]; + view_xml_id = parseInt((view_find.attr('id')).split('-')[1]); break; } if(view_find.attr('level') < min_level){ @@ -468,8 +469,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ break; case "side-remove": if (confirm(_t("Do you really want to remove this node?"))) { - self.do_save_update_arch - (one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "remove_node"); + self.do_save_update_arch("remove_node"); } break; case "side-edit": @@ -498,9 +498,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ return _.includes(element, res); })); }); - console.log(property_to_check,fields); - //self.on_add_node(property_to_check, fields , - // clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); + self.on_add_node(property_to_check, fields); }); }, do_node_edit: function(side){ @@ -510,8 +508,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ return _.includes(tr, res); }); var properties = _PROPERTIES[tag]; - console.log(properties); - //self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); + self.on_edit_node(properties); }, do_node_down: function(cur_tr, img){ var self = this; @@ -553,7 +550,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ _.each(tr_to_move, function(rec) { $(last_tr).after(rec); }); - // self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "down"); + self.do_save_update_arch("down"); } }, do_node_up: function(cur_tr, img){ @@ -588,13 +585,14 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ _.each(tr_to_move, function(rec) { $(last_tr).before(rec); }); - //self.do_save_update_arch(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "up"); + self.do_save_update_arch("up"); } }, - do_save_update_arch: function(one_object, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, move_direct, update_values) { + do_save_update_arch: function(move_direct, update_values) { var self = this; - 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'], []); + var arch = _.detect(self.one_object['arch'], function(element) + {return element.view_id == self.one_object.clicked_tr_view[0]}); + var obj = self.get_object_by_id(this.one_object.clicked_tr_view[1],this.one_object['main_object'], []); //for finding xpath tag from inherit view var xml_arch = QWeb.load_xml(arch.arch); if (xml_arch.childNodes[0].tagName == "data") { @@ -612,44 +610,63 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ return child.nodeType == 1; }); - return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0], - parseInt(clicked_tr_id), [], parseInt(clicked_tr_level), - parseInt(view_id), arch, move_direct, update_values); + return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0],[], move_direct, update_values,arch); }, - get_object_by_id: function(view_xml_id, one_object, result) { + get_object_by_id: function(id ,one_object, result) { var self = this; if (result.length == 0 ) { var check = _.detect(one_object , function(obj) { - return view_xml_id == obj.id; + return self.one_object.clicked_tr_view[1] == obj.id; }); if (check) {result.push(check);}; _.each(one_object, function(obj) { - self.get_object_by_id(view_xml_id, obj.child_id, result); + self.get_object_by_id(id,obj.child_id, result); }); } return result; }, - do_save_xml: function(arch1, obj, id, child_list, level, view_id, arch, move_direct, update_values){ + create_clone: function(clone, new_node_obj){ + var self = this; + clone.find('a').text(new_node_obj.name); + clone.attr("id","viewedit-" + new_node_obj.id); + clone.attr("level",new_node_obj.level); + clone.find("img[id^='parentimg-']").remove(); + clone.bind("click",function(){ + self.do_select_row(this.id.split('-')[1]); + }); + clone.find("img[id^='side-']").click(function() { + self.on_select_img(this); + }); + clone.find("img[id^='parentimg-']").click(function() { + self.do_parent_img_hide_show(this); + }); + return clone; + }, + do_save_xml: function(arch1, obj, child_list, move_direct, update_values, arch){ var self = this; var children_list = $(arch1).children(); var list_obj_xml = _.zip(children_list, obj.child_id); - if (id) { - if (obj.id == id) { - var id; + if (this.one_object.clicked_tr_id) { + if (obj.id == this.one_object.clicked_tr_id) { + var parent; var index = _.indexOf(child_list, obj); if (move_direct == "down") { var next = $(arch1).next(); $(next).after(arch1); var re_insert_obj = child_list.splice(index, 1); child_list.splice(index+1, 0, re_insert_obj[0]); - var parent = $(arch1).parents(); + parent = $(arch1).parents(); + } else if (move_direct == "up") { + var prev = $(arch1).prev(); $(prev).before(arch1); var re_insert_obj = child_list.splice(index, 1); child_list.splice(index-1, 0, re_insert_obj[0]); - var parent = $(arch1).parents(); + parent = $(arch1).parents(); + } else if (move_direct == "update_node") { + _.each(update_values, function(val){ if(val[0] == "required"){ $(arch1).attr("required", "true"); @@ -659,45 +676,40 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); var new_obj = self.create_View_Node(arch1); new_obj.id = obj.id,new_obj.child_id = obj.child_id; - self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").find('a').text(new_obj.name); + self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']") + .find('a').text(new_obj.name); child_list.splice(index, 1, new_obj); - var parent = $(arch1).parents(); + parent = $(arch1).parents(); + }else if(move_direct == "add_node"){ var temp_xml = QWeb.load_xml(update_values[0]); var object_xml = self.create_View_Node(temp_xml.childNodes[0]); - var clone = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").clone(); - clone.find('a').text(object_xml.name); - clone.attr("id","viewedit-" + object_xml.id ); - clone.bind("click",function(){ - self.do_select_row(object_xml.id); - }); - clone.find("img[id^='side-']").click(function() { - self.on_select_img(this); - }); - clone.find("img[id^='parentimg-']").click(function() { - self.do_parent_img_hide_show(this); - }); + (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level; + var clone = self.create_clone(self.edit_xml_dialog.$element. + find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']").clone(),object_xml); switch (update_values[1]) { case "After": - object_xml.level = obj.level; $(arch1).after(update_values[0]); child_list.splice(index + 1, 0, object_xml); break; case "Before": - object_xml.level = obj.level; $(arch1).before(update_values[0]); child_list.splice(index - 1, 0, object_xml); break; case "Inside": - object_xml.level = obj.level + 1; $(arch1).append(update_values[0]); obj.child_id.push(object_xml); break; } - self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id+"']").after(clone); - var parent = $(arch1).parents(); + self.edit_xml_dialog.$element. + find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']").after(clone); + self.edit_xml_dialog.$element. + find("tr[id='viewedit-" + object_xml.id + "']").removeClass('ui-selected'); + parent = $(arch1).parents(); + }else if(move_direct == "remove_node"){ - var parent = $(arch1).parents(); + + parent = $(arch1).parents(); if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){ id = id -1; level = level - 1; @@ -705,33 +717,35 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } $(arch1).remove(); child_list.splice(index,1); - var cur_tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+id +"']"); - _.each(self.get_list_tr(cur_tr,level), function(tr_element){ + var cur_tr = self.edit_xml_dialog.$element. + find("tr[id='viewedit-" + self.one_object.clicked_tr_id + "']"); + _.each(self.get_list_tr(cur_tr,self.one_object.clicked_tr_level), function(tr_element){ tr_element.remove(); }); cur_tr.remove(); } + var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1; - /*if(convert_to_utf != "remove_view"){ + if(convert_to_utf != "remove_view"){ convert_to_utf = QWeb.tools.xml_node_to_string(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; - this.dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { - }); + /*this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) { + });*/ }else{ - this.dataset.unlink([parseInt(view_id)],function(res) { - }); + //this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) { + //}); } if(move_direct == "add_node"){ self.add_node_dialog.close(); - self.edit_xml_dialog.close(); - self.xml_element_id = 0; - self.get_arch();}*/ + self.on_select_img(clone.find("img[id='side-edit']")[0]); + } } - if (obj.level <= level) { + if (obj.level <= this.one_object.clicked_tr_level) { _.each(list_obj_xml, function(child_node) { - self.do_save_xml(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct, update_values); + self.do_save_xml(child_node[0], child_node[1], obj.child_id, + move_direct, update_values, arch); }); } } @@ -765,7 +779,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ tr.show(); }); }, - on_edit_node:function(properties, clicked_tr_id, obj, view_id, view_xml_id, clicked_tr_level){ + on_edit_node:function(properties){ var self = this; this.edit_node_dialog = new openerp.web.Dialog(this,{ modal: true, @@ -780,7 +794,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ update_values.push([widget.name, widget.get_value()]); } }); - self.do_save_update_arch(obj, view_id, view_xml_id, clicked_tr_id, clicked_tr_level, "update_node", update_values); + self.do_save_update_arch("update_node", update_values); self.edit_node_dialog.close(); }, "Cancel": function(){ @@ -790,7 +804,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }); this.edit_node_dialog.start().open(); var widget = _.keys(self.property.map); - var arch_val = self.get_object_by_id(clicked_tr_id,obj['main_object'], []); + var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []); this.edit_node_dialog.$element.append('
'); this.edit_widget = []; _.each(properties, function(property) { @@ -846,7 +860,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ }) return def.promise(); }, - on_add_node: function(properties,fields,clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level){ + on_add_node: function(properties, fields){ var self = this; var positions = ['After','Before','Inside']; var render_list = []; @@ -877,8 +891,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var tag = (values.node_type == "field")? _.sprintf("<%s name='%s'> ",values.node_type,values.field_value,values.node_type): _.sprintf("<%s> ",values.node_type,values.node_type); - self.do_save_update_arch(one_object, view_id, view_xml_id, - clicked_tr_id, clicked_tr_level, "add_node", [tag, values.position]); + self.do_save_update_arch("add_node", [tag, values.position]); }else{alert("Can't Update View");} }, "Cancel": function(){ diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9b1c5175571..25cfaee1232 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1692,4 +1692,4 @@
- \ No newline at end of file + From d206d8dc42f4c364a407637d346e18d01ae4eaad Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 21 Nov 2011 18:32:31 +0530 Subject: [PATCH 15/17] [IMP]add new node last in group. bzr revid: vme@tinyerp.com-20111121130231-zsv1py2lnljy5t3x --- addons/web/static/src/js/view_editor.js | 46 ++++++++++++++++--------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index f578d9da006..033c2a31850 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -432,7 +432,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ on_select_img: function(element_img){ var self = this; - console.log("kooooo",element_img); var side = $(element_img).closest("tr[id^='viewedit-']"); this.one_object.clicked_tr_id = parseInt((side.attr('id')).split('-')[1]); this.one_object.clicked_tr_level = parseInt(side.attr('level')); @@ -616,7 +615,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var self = this; if (result.length == 0 ) { var check = _.detect(one_object , function(obj) { - return self.one_object.clicked_tr_view[1] == obj.id; + return id == obj.id; }); if (check) {result.push(check);}; _.each(one_object, function(obj) { @@ -625,9 +624,10 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } return result; }, - create_clone: function(clone, new_node_obj){ + create_clone: function(clone, new_node_obj, position){ var self = this; clone.find('a').text(new_node_obj.name); + ($(clone.find('a').parent()).siblings('td')).css( "padding-left", 20 * new_node_obj.level); clone.attr("id","viewedit-" + new_node_obj.id); clone.attr("level",new_node_obj.level); clone.find("img[id^='parentimg-']").remove(); @@ -637,9 +637,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ clone.find("img[id^='side-']").click(function() { self.on_select_img(this); }); - clone.find("img[id^='parentimg-']").click(function() { - self.do_parent_img_hide_show(this); - }); return clone; }, do_save_xml: function(arch1, obj, child_list, move_direct, update_values, arch){ @@ -682,33 +679,48 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ parent = $(arch1).parents(); }else if(move_direct == "add_node"){ + var tr_click = + self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']"); var temp_xml = QWeb.load_xml(update_values[0]); var object_xml = self.create_View_Node(temp_xml.childNodes[0]); (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level; - var clone = self.create_clone(self.edit_xml_dialog.$element. - find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']").clone(),object_xml); + var clone = self.create_clone(tr_click.clone(),object_xml); switch (update_values[1]) { case "After": + tr_click.after(clone); $(arch1).after(update_values[0]); child_list.splice(index + 1, 0, object_xml); break; case "Before": + tr_click.before(clone); $(arch1).before(update_values[0]); child_list.splice(index - 1, 0, object_xml); break; case "Inside": + var after_append = _.detect(self.one_object['parent_child_id'],function(ele){ + return self.one_object.clicked_tr_id == ele.key; + }); + after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id; + if(tr_click.find("img[id^='parentimg-']").length == 0){ + ($(tr_click.find('a').parent()).siblings('td')) + .append($(''). + attr('src', '/web/static/src/img/collapse.gif'). + attr('id','parentimg-'+ self.one_object.clicked_tr_id) + .click(function(){ + self.do_parent_img_hide_show(this); + })); + } + self.edit_xml_dialog.$element. + find("tr[id='viewedit-"+after_append+"']").after(clone); $(arch1).append(update_values[0]); obj.child_id.push(object_xml); break; } - self.edit_xml_dialog.$element. - find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']").after(clone); self.edit_xml_dialog.$element. find("tr[id='viewedit-" + object_xml.id + "']").removeClass('ui-selected'); parent = $(arch1).parents(); }else if(move_direct == "remove_node"){ - parent = $(arch1).parents(); if(parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")){ id = id -1; @@ -723,6 +735,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ tr_element.remove(); }); cur_tr.remove(); + self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]); } var convert_to_utf = (parent.length != 0)?parent[parent.length-1]:arch1; @@ -731,15 +744,16 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ 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; - /*this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) { - });*/ + this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) { + }); }else{ - //this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) { - //}); + this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) { + }); } if(move_direct == "add_node"){ self.add_node_dialog.close(); self.on_select_img(clone.find("img[id='side-edit']")[0]); + self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]); } } if (obj.level <= this.one_object.clicked_tr_level) { @@ -779,7 +793,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ tr.show(); }); }, - on_edit_node:function(properties){ + on_edit_node: function(properties){ var self = this; this.edit_node_dialog = new openerp.web.Dialog(this,{ modal: true, From 5c0b707510bf4ebcbbf873f28456c81f7e166048 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 22 Nov 2011 12:51:57 +0530 Subject: [PATCH 16/17] [IMP] fix view for new field dialog box. bzr revid: vme@tinyerp.com-20111122072157-rw2h87p6u4dyrjak --- addons/web/static/src/js/view_editor.js | 45 +++++++++++++++---------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index f907612bc1c..bb0ffba5b73 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -507,12 +507,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var properties = _PROPERTIES[result[0].att_list[0]]; self.on_edit_node(properties); } -/* var tr = $(side).find('a').text(); - var tag = _.detect(_.keys(_PROPERTIES),function(res){ - return _.includes(tr, res); - }); - var properties = _PROPERTIES[tag]; - self.on_edit_node(properties);*/ }, do_node_down: function(cur_tr, img){ var self = this; @@ -930,14 +924,14 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var render_list = []; var render_list =[{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type','type': 'selection'}, - {'name': 'position','selection': positions, 'value': false, 'string': 'Position','type': 'selection'}, - {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'}]; + {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'}, + {'name': 'position','selection': positions, 'value': false, 'string': 'Position','type': 'selection'} ]; this.add_widget = []; this.add_node_dialog = new openerp.web.Dialog(this,{ modal: true, title: 'Properties', - width: 500, - height: 300, + width: 450, + height: 190, buttons: { "Update": function(){ var check_add_node = true; @@ -964,16 +958,27 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ } }).start().open(); this.add_node_dialog.$element. - append('
'); - var table_selector = self.add_node_dialog.$element.find('table[id=rec_table]'); + append('
'); + var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody'); _.each(render_list,function(node){ type_widget = new (self.property.get_any([node.type])) (self.add_node_dialog, node); - table_selector.append('' + node.string + ':' + type_widget.render() + ''); + if(node.name == "position"){ + table_selector. + append('' + node.string + '' + type_widget.render() + ''); + }else{ + table_selector. + append('' + node.string + '' + type_widget.render() ); + if(node.name == "field_value"){ + table_selector. + append(' '); + } + } type_widget.start(); type_widget.set_value(node.value); self.add_widget.push(type_widget); }); - table_selector.append(' '); + console.log("table_selector.find", table_selector.find("td[id^=]")); + table_selector.find("td[id^=]").attr("width","100px"); self.add_node_dialog.$element.find('#new_field').click(function() { model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null); model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) { @@ -1001,7 +1006,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ new_fields_name = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null); new_fields_name.read_ids([controller.datarecord.id], ['name'], function(result) { self.add_node_dialog.$element. - find('select[id=field_value]'). append($(""). + find('select[id=field_value]').append($(""). attr("value",result[0].name).text(result[0].name)); _.detect(self.add_widget,function(widget){ (widget.name == "field_value")?widget.selection.push(result[0].name):false; @@ -1090,9 +1095,13 @@ openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({ this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() { self.on_ui_change(); if(self.name == "node_type"){ - (self.get_value() == "field")? - self.$element.find("select[id=field_value]").show(): - self.$element.find("select[id=field_value]").hide(); + if(self.get_value() == "field"){ + self.$element.find('#new_field').show(); + self.$element.find("select[id=field_value]").show(); + }else{ + self.$element.find('#new_field').hide(); + self.$element.find("select[id=field_value]").hide(); + } } }); From 37f2f7cd4ca1817f3bcc61ff073f547a11b7ce91 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Tue, 22 Nov 2011 14:14:47 +0530 Subject: [PATCH 17/17] [IMP]improvement in code. bzr revid: vme@tinyerp.com-20111122084447-jny55ehsiksd3v0d --- addons/web/static/src/js/view_editor.js | 39 +++++++++++++------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index bb0ffba5b73..173b3bfc4f0 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -486,19 +486,21 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var self = this; var tr = $(side).find('a').text(); var parent_tr = ($(side).prevAll("tr[level="+String(this.one_object.clicked_tr_level - 1)+"]"))[0]; + var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null); parent_tr = $(parent_tr).find('a').text(); - self.rpc("/web/searchview/fields_get", {model:self.model}, function(result) { - var fields = _.keys(result.fields); - fields.push(" "),fields.sort(); - var property_to_check = []; - _.each([tr,parent_tr],function(element){ - property_to_check.push( - _.detect(_.keys(_CHILDREN),function(res){ - return _.str.include(element, res); - })); - }); - self.on_add_node(property_to_check, fields); + field_dataset.call( 'fields_get', [], function(result) { + var fields = _.keys(result); + fields.push(" "),fields.sort(); + var property_to_check = []; + _.each([tr,parent_tr],function(element){ + property_to_check.push( + _.detect(_.keys(_CHILDREN),function(res){ + return _.str.include(element, res); + })); }); + self.on_add_node(property_to_check, fields); + }); + }, do_node_edit: function(side){ var self = this; @@ -681,9 +683,15 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ var object_xml = self.create_View_Node(temp_xml.childNodes[0]); (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level; var clone = self.create_clone(tr_click.clone(),object_xml); + var after_append = _.detect(self.one_object['parent_child_id'],function(ele){ + return self.one_object.clicked_tr_id == ele.key; + }); + after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id; + switch (update_values[1]) { case "After": - tr_click.after(clone); + self.edit_xml_dialog.$element. + find("tr[id='viewedit-"+after_append+"']").after(clone); $(arch1).after(update_values[0]); child_list.splice(index + 1, 0, object_xml); break; @@ -693,10 +701,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ child_list.splice(index - 1, 0, object_xml); break; case "Inside": - var after_append = _.detect(self.one_object['parent_child_id'],function(ele){ - return self.one_object.clicked_tr_id == ele.key; - }); - after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id; if(tr_click.find("img[id^='parentimg-']").length == 0){ ($(tr_click.find('a').parent()).siblings('td')) .append($(''). @@ -706,9 +710,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ self.do_parent_img_hide_show(this); })); } + $(arch1).append(update_values[0]); self.edit_xml_dialog.$element. find("tr[id='viewedit-"+after_append+"']").after(clone); - $(arch1).append(update_values[0]); obj.child_id.push(object_xml); break; } @@ -977,7 +981,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ type_widget.set_value(node.value); self.add_widget.push(type_widget); }); - console.log("table_selector.find", table_selector.find("td[id^=]")); table_selector.find("td[id^=]").attr("width","100px"); self.add_node_dialog.$element.find('#new_field').click(function() { model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null);