[MERGE] vieweditor :- code improvement.

bzr revid: ysa@tinyerp.com-20111103120636-ed1ibkxkvfxcni7k

1 files changed, 135 insertions, 159 deletions

diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js
index 71cda6fcc47..c26fecc062c 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.init_view_editor();
@@ -40,208 +40,185 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             width: 750,
             height: 500,
             buttons: {
-                "Create": function(){
-                    //to do
-                },
-                "Edit": function(){
-                    self.xml_id=0;
-                    self.get_data();
-                },
-                "Close": function(){
-                    self.view_edit_dialog.close();
-                }
+            "Create": function(){
+                //to do
             },
-        });
-        this.view_edit_dialog.start().open();
+            "Edit": function(){
+                self.xml_element_id=0;
+                self.get_arch();
+            },
+            "Close": function(){
+                $(this).dialog('destroy');
+            }
+        },
+        }).start().open();
         var action_manager = new openerp.web.ActionManager(this);
         action_manager.appendTo(this.view_edit_dialog);
         action_manager.do_action(action);
     },
-    check_attr: function(xml, tag, level) {
-        var obj = {'child_id': [], 'id': this.xml_id++, 'level': level+1, 'att_list': [], 'name': ""};
-        var render_name = "<" + tag;
+
+    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();
         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 + '"' ;
-                    }
-                } else {
-                    if (attrs.nodeName == "name") {
-                        render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';
-                    }
-                }
-                obj.att_list.push( [attrs.nodeName,attrs.nodeValue] );
+            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] );
             });
-            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,child_node.tagName.toLowerCase(),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 < children_list.length; i++) {
-            self.xml_node_create
-            (children_list[i], children_list[i].tagName.toLowerCase(),
-                parent_list, child_obj_list[i].id, main_object);
+        for (var i=0; i<children_list.length; i++) {
+            self.convert_arch_to_obj
+            (children_list[i], parent_list, child_obj_list[i].id, main_object);
         }
         return main_object;
     },
     parse_xml: function(arch, view_id) {
         var root = $(arch).filter(":first")[0];
         var tag = root.tagName.toLowerCase();
-        var obj ={'child_id':[],'id':this.xml_id++,'level':0,'att_list':[],'name':"<view view_id='"+view_id+"'>"};
-        var root_object = this.check_attr(root,tag,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':"<view view_id='"+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_data: function() {
+    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) {
-            one_object = self.parse_xml(arch[0].arch,self.main_view_id);
+            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});
             dataset = new openerp.web.DataSetSearch(self, 'ir.ui.view', null, null);
             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});
-                    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])){
-                        var list_1 = _.select(val,function(element){
-                            var main_list = _.flatten(element.att_list);
-                            return _.include(main_list, check[0]);
+                        //for field[3]
+                        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 {
-                        obj = _.detect(val, function(element){
-                            var main_list = _.flatten(element.att_list);
-                            return _.include(main_list, check[0]);
+                        //for notebook[last()]
+                        obj = _.detect(arch_object, function(element){
+                            return _.include(_.flatten(element.att_list), check[0]);
                         });
                     }
                     break;
                 case 3:
-                    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;}
+                    //for field[@name='type']
+                    obj = _.detect(arch_object, function(element){
+                        if((_.intersection(_.flatten(element.att_list),_.uniq(check))).length == check.length){
+                            return element;
+                        }
                     });
                     break;
                 case 1:
-                    var list_1 = _.select(val,function(element){
-                        var main_list = _.flatten(element.att_list);
-                        return _.include(main_list, check[0]);
+                    //for /form/notebook
+                    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 {
-                    var level = obj.level+1;
-                    self.increase_level(xpath_object[0], level)
-                    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);
                 });
             }
         }
@@ -307,23 +284,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;
                 }
             }
@@ -337,40 +314,43 @@ 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-" + 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 {
-                                list_shift.push(next_tr);
+                                next_tr.hide();
+                                tr_to_move.push(next_tr);
                                 side = next_tr;
                             }
                         }
                     }
-                    if (last_tr.length != 0  && parseInt(last_tr.attr('level')) == level &&
-                        (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) {
-                        _.each(list_shift, function(rec) {
+                    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.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;
                         }
                    }
@@ -381,7 +361,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) {
@@ -389,42 +369,40 @@ 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){
-                var temp_obj = self.check_attr(xml_child, xml_child.tagName.toLowerCase());
+                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;}
             });
         }
-        return self.get_node(arch.arch, obj[0].child_id[0], parseInt(id_tr), [], parseInt(level),
-            parseInt(view_id), arch, move_direct);
+        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){
@@ -432,12 +410,12 @@ 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);
@@ -467,9 +445,9 @@ 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);
+            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);
                 });
             }
         }
@@ -486,7 +464,6 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             return false;
          }
        }
-
     },
     on_expand: function(expand_img){
         var level = parseInt($(expand_img).closest("tr[id^='viewedit-']").attr('level'));
@@ -511,6 +488,5 @@ openerp.web.ViewEditor =   openerp.web.Widget.extend({
             tr.show();
         });
     }
-
 });
 };