diff options
| author | Fabien Meghazi <fme@openerp.com> | 2013-03-21 16:28:31 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2013-03-21 16:28:31 +0100 |
| commit | 43cba221b2970b891e90de400ef28fa6c36d767f (patch) | |
| tree | 9b97a09b9f94c18f687cb0a5a0711f91b47e79d3 /addons/web_view_editor/static | |
| parent | 4c75931f6cbf624612ab5b2d97a3708df9e69c2d (diff) | |
[FIX] View editor does not handle inherited views
lp bug: https://launchpad.net/bugs/1157117 fixed
bzr revid: fme@openerp.com-20130321152831-n3bkdtoru72hbbub
Diffstat (limited to 'addons/web_view_editor/static')
| -rw-r--r-- | addons/web_view_editor/static/src/js/view_editor.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js index a7906689cce..48b76e02904 100644 --- a/addons/web_view_editor/static/src/js/view_editor.js +++ b/addons/web_view_editor/static/src/js/view_editor.js @@ -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); }, |