pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] branding distribution in views

Browse Source 
bzr revid: fp@openerp.com-20130804205215-0g8fvzy8aducrc3v
This commit is contained in:
Fabien Pinckaers
2013-08-04 22:52:15 +02:00
parent f8a71e4a87
commit b8f5817c8b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_ui_view.py
+2 -2
View File
@@ -714,7 +714,7 @@ class view(osv.osv):
return r['arch']
def distribute_branding(self, e, branding=None, xpath=None, count=None):
if e.attrib.get('t-ignore'):
if e.attrib.get('t-ignore') or e.tag in ('head',):
# TODO: find a better name and check if we have a string to boolean helper
return
branding_copy = ['data-oe-model','data-oe-id','data-oe-field','data-oe-xpath']
@@ -726,7 +726,7 @@ class view(osv.osv):
if e.attrib.get('data-oe-model'):
# if a branded tag containg branded tag distribute to the childs
child_text = "".join([etree.tostring(x, encoding='utf-8') for x in e])
if re.search('(data-oe-model=|t-esc=|t-raw=|t-field=|t-call=|t-ignore=)',child_text) or e.tag == "t" or 't-raw' in e.attrib:
if re.search('( data-oe-model=| t-esc=| t-raw=| t-field=| t-call=| t-ignore=)',child_text) or e.tag == "t" or 't-raw' in e.attrib:
for i in branding_copy:
if e.attrib.get(i):
branding_dist[i] = e.attrib.get(i)