odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]create parent-child list after inherit view. 

bzr revid: vme@tinyerp.com-20111007061604-zv97xy6byxmm5qhv
This commit is contained in:
Vidhin Mehta (OpenERP) 2011-10-07 11:46:04 +05:30
parent 5bffa6a135
commit c36d4ddea4
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addons/web/static/src/js/view_editor.js
View File

@ -60,7 +60,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
action_manager.do_action(action); action_manager.do_action(action);
}, },
check_attr: function(xml ,tag,level) { check_attr: function(xml ,tag, level) {
var obj = new Object(); var obj = new Object();
obj.child_id = []; obj.child_id = [];
obj.id = this.xml_id++; obj.id = this.xml_id++;
@ -82,14 +82,14 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
return obj; return obj;
}, },
save_object: function(val, parent_list, child_obj_list){ save_object: function(val, parent_list, child_obj_list) {
var self = this; var self = this;
var check_id = parent_list[0]; var check_id = parent_list[0];
var p_list = parent_list.slice(1); var p_list = parent_list.slice(1);
if (val.child_id.length != 0) { if (val.child_id.length != 0) {
$.each(val.child_id, function(key, val) { $.each(val.child_id, function(key, val) {
if (val.id == check_id) { if (val.id == check_id) {
if (p_list.length!=0) { if (p_list.length != 0) {
self.save_object(val, p_list, child_obj_list); self.save_object(val, p_list, child_obj_list);
} else { } else {
val.child_id = child_obj_list; val.child_id = child_obj_list;
@ -152,17 +152,24 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
var ve_dataset = new openerp.web.DataSet(this,'ir.ui.view'); var ve_dataset = new openerp.web.DataSet(this,'ir.ui.view');
ve_dataset.read_ids([parseInt(view_id)], ['arch'], function (arch) { ve_dataset.read_ids([parseInt(view_id)], ['arch'], function (arch) {
one_object = self.parse_xml(arch[0].arch,view_id); one_object = self.parse_xml(arch[0].arch,view_id);
one_object.arch = arch[0].arch;
dataset = new openerp.web.DataSetSearch(self, 'ir.ui.view', null, null); dataset = new openerp.web.DataSetSearch(self, 'ir.ui.view', null, null);
dataset.read_slice([],{domain : [['inherit_id','=',parseInt(view_id)]]},function (result) { dataset.read_slice([],{domain : [['inherit_id','=',parseInt(view_id)]]},function (result) {
_.each(result,function(res){
self.inherit_view(one_object,res); return self.edit_view({"main_object": one_object,
}); "parent_child_id": self.parent_child_list(one_object, [])});
return self.edit_view(one_object);
}); });
}); });
}, },
parent_child_list: function(one_object, p_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);
}
});
return p_list;
},
inherit_view: function(one_object, result){ inherit_view: function(one_object, result){
var self = this; var self = this;
var root = $(result.arch).filter('*'); var root = $(result.arch).filter('*');
@ -249,6 +256,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
edit_view : function(one_object){ edit_view : function(one_object){
var self = this; var self = this;
console.log("++++++++++++++++++++++",one_object);
this.dialog = new openerp.web.Dialog(this,{ this.dialog = new openerp.web.Dialog(this,{
modal: true, modal: true,
title: 'Edit Xml', title: 'Edit Xml',
@ -268,7 +276,7 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({
}); });
this.dialog.start().open(); this.dialog.start().open();
this.dialog.$element.html(QWeb.render('view_editor', { this.dialog.$element.html(QWeb.render('view_editor', {
'data': one_object, 'data': one_object['main_object'],
})); }));
$("tr[id^='viewedit-']").click(function() { $("tr[id^='viewedit-']").click(function() {