From bc3a1f52940ec65db7b72141490711aacb6703a5 Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Wed, 16 Nov 2011 17:06:24 +0530 Subject: [PATCH] [IMP] vieweditor :- remove inherit button code and improve code. bzr revid: ysa@tinyerp.com-20111116113624-p1dwbl4oefut2lse --- addons/web/static/src/js/view_editor.js | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 9bbfbdf8f9a..e2f818870ec 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -376,15 +376,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ height: 500, buttons: { "Inherited View": function() { - var selected_row = self.edit_xml_dialog.$element.find('.ui-selected'); - if (selected_row.length) { - var xml_arch = QWeb.load_xml(selected_row.find('a').text()); - var tag_name = xml_arch.childNodes? xml_arch.childNodes[0].tagName: ""; - console.log(" xml_arch.childNodes[0]::::", xml_arch.childNodes[0].getAttribute()); - if (tag_name == 'field') { - return true; - } - } + //TODO }, "Preview": function() { var action = { @@ -458,12 +450,12 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ case "side-remove": break; case "side-edit": - var xml_arch = QWeb.load_xml($(this).closest("tr[id^='viewedit-']").find('a').text()); - var tag_name = xml_arch.childNodes? xml_arch.childNodes[0].tagName: false; - if (tag_name) { - var properties = _PROPERTIES[tag_name]; - self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); - } + var tr = $(this).closest("tr[id^='viewedit-']").find('a').text(); + var tag = _.detect(_.keys(_PROPERTIES),function(res){ + return _.include(tr, res); + }); + var properties = _PROPERTIES[tag]; + self.on_edit_node(properties, clicked_tr_id, one_object, view_id, view_xml_id, clicked_tr_level); break; case "side-up": while (1) {