From bfd97c110f9726a4e665e54670c5dffffb194edd Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 2 Aug 2013 13:46:06 +0200 Subject: [PATCH] [FIX] typo in attribute name, don't distribute on t-field bzr revid: xmo@openerp.com-20130802114606-ef0pddt2uhc4ghlj --- openerp/addons/base/ir/ir_ui_view.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 96c56cdbd4a..f6723d64a03 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -726,7 +726,9 @@ class view(osv.osv): # if a branded element contains branded elements distribute own # branding to children unless it's t-raw, then just remove branding # on current element - if e.tag == 't' or 't.raw' in e.attrib or any(BRANDING_TRIGGERS.intersection(child.attrib) for child in e.iterdescendants()): + if e.tag == 't' or 't-raw' in e.attrib or\ + any(BRANDING_TRIGGERS.intersection(child.attrib) + for child in e.iterdescendants()): distributed_branding = dict( (attribute, e.attrib.pop(attribute)) for attribute in MOVABLE_BRANDING @@ -830,7 +832,7 @@ class view(osv.osv): return super(view, self).copy(cr, uid, id, default, context=context) MOVABLE_BRANDING = ['data-oe-model','data-oe-id','data-oe-field','data-oe-xpath'] -BRANDING_TRIGGERS = frozenset(('data-oe-model', 't-esc', 't-raw', 't-field', 't-call', 't-ignore')) +BRANDING_TRIGGERS = frozenset(('data-oe-model', 't-esc', 't-raw', 't-call', 't-ignore')) class view_sc(osv.osv): _name = 'ir.ui.view_sc'