[IMP] vieweditor:- code refactor.
bzr revid: ysa@tinyerp.com-20111103130455-u9i5okx02jioq3an
This commit is contained in:
parent
bc9c13dc0c
commit
bd1a878407
|
@ -66,20 +66,27 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
|
|||
});
|
||||
});
|
||||
},
|
||||
|
||||
convert_tag_to_obj: function(xml, level) {
|
||||
var obj = {'child_id':[],'id':this.xml_element_id++,'level':level+1,'att_list':[],'name':""};
|
||||
var obj = {
|
||||
'child_id': [],
|
||||
'id': this.xml_element_id++,
|
||||
'level': level + 1,
|
||||
'att_list': [],
|
||||
'name': ''
|
||||
};
|
||||
var tag = xml.tagName.toLowerCase();
|
||||
obj.att_list.push(tag);
|
||||
obj.name = "<"+ tag
|
||||
obj.name = "<" + tag;
|
||||
$(xml).each(function() {
|
||||
_.each(this.attributes, function(attrs) {
|
||||
if (tag != 'button' && tag != 'field') {
|
||||
if (attrs.nodeName == "string" ) {
|
||||
obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ;}
|
||||
obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';
|
||||
}
|
||||
} else {
|
||||
if (attrs.nodeName == "name") {
|
||||
obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';}
|
||||
obj.name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"';
|
||||
}
|
||||
}
|
||||
obj.att_list.push([attrs.nodeName, attrs.nodeValue]);
|
||||
});
|
||||
|
@ -87,7 +94,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
|
|||
});
|
||||
return obj;
|
||||
},
|
||||
|
||||
append_child_object: function(val, parent_list, child_obj_list) {
|
||||
var self = this;
|
||||
if (val.child_id.length != 0) {
|
||||
|
@ -97,7 +103,6 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
|
|||
});
|
||||
} else { val.child_id = child_obj_list; }
|
||||
},
|
||||
|
||||
convert_arch_to_obj: function(xml, parent_list, parent_id, main_object){
|
||||
var self = this;
|
||||
var child_obj_list = [];
|
||||
|
@ -112,16 +117,20 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
|
|||
self.append_child_object(main_object[0], parent_list.slice(1), child_obj_list);
|
||||
}
|
||||
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);
|
||||
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 view_obj ={'child_id':[],'id':this.xml_element_id++,
|
||||
'level':0,'att_list':[],'name':"<view view_id='"+view_id+"'>"};
|
||||
var view_obj = {
|
||||
'child_id': [],
|
||||
'id': this.xml_element_id++,
|
||||
'level': 0,
|
||||
'att_list': [],
|
||||
'name': _.sprintf("<view view_id='%d'>", 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];
|
||||
|
@ -129,8 +138,8 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
|
|||
get_arch: function() {
|
||||
var self = this;
|
||||
var view_arch_list = [];
|
||||
var ve_dataset = new openerp.web.DataSet(this, 'ir.ui.view');
|
||||
ve_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function (arch) {
|
||||
var view_dataset = new openerp.web.DataSet(this, 'ir.ui.view');
|
||||
view_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function(arch) {
|
||||
var arch_object = self.parse_xml(arch[0].arch, self.main_view_id);
|
||||
self.main_view_type = arch[0].type
|
||||
view_arch_list.push({"view_id": self.main_view_id, "arch": arch[0].arch});
|
||||
|
@ -160,7 +169,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
|
|||
var self = this;
|
||||
var root = $(result.arch).filter('*');
|
||||
var xml_list = [];
|
||||
(root[0].tagName.toLowerCase() == "data")?xml_list = $(root[0]).children() : xml_list.push(root[0]);
|
||||
root[0].tagName.toLowerCase() == "data"? xml_list = $(root[0]).children() : xml_list.push(root[0]);
|
||||
_.each(xml_list, function(xml) {
|
||||
var expr_to_list = [];
|
||||
var xpath_arch_object = self.parse_xml(xml,result.id);
|
||||
|
@ -170,8 +179,9 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
|
|||
expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"), ""));
|
||||
});
|
||||
} else {
|
||||
var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list)
|
||||
{ return _.include(list, "position")});
|
||||
var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) {
|
||||
return _.include(list, "position")
|
||||
});
|
||||
expr_to_list = [_.flatten(temp)];
|
||||
}
|
||||
self.inherit_apply(expr_to_list, arch_object ,xpath_arch_object);
|
||||
|
|
Loading…
Reference in New Issue