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

[FIX] View editor does not handle inherited views 

lp bug: https://launchpad.net/bugs/1157117 fixed

bzr revid: fme@openerp.com-20130321152831-n3bkdtoru72hbbub
This commit is contained in:
Fabien Meghazi 2013-03-21 16:28:31 +01:00
parent 4c75931f6c
commit 43cba221b2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web_view_editor/static/src/js/view_editor.js
View File

@ -637,12 +637,12 @@ instance.web_view_editor.ViewEditor = instance.web.Widget.extend({
var children = _.filter(xml_arch.childNodes[0].childNodes, function (child) {
return child.nodeType == 1;
});
arch.arch = _.detect(children, function(xml_child) {
var inherited_view = _.detect(children, function(xml_child) {
var temp_obj = self.create_View_Node(xml_child),
insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
if (insert.length == _.uniq(check_list).length ) {return xml_child;}
});
xml_arch = QWeb.load_xml(arch.arch);
xml_arch = QWeb.load_xml(instance.web.xml_to_str(inherited_view));
}
return self.do_save_xml(xml_arch.documentElement, obj[0].child_id[0],obj[0].child_id, move_direct, update_values,arch);
},