From 9c0cf695094130fe8a6c8895c34794ab97d297f2 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 4 Aug 2013 22:23:31 +0200 Subject: [PATCH 1/3] [IMP] changed t-field syntax from
to
bzr revid: fp@openerp.com-20130804202331-plkhcfry1zg880rx --- openerp/tools/qweb.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py index 8330359b6f4..d13e7491aa5 100644 --- a/openerp/tools/qweb.py +++ b/openerp/tools/qweb.py @@ -278,10 +278,11 @@ class QWebXml(object): def render_tag_field(self, e, t_att, g_att, v): """ eg: +1 555 555 8069""" - record = v[t_att["record"]] + + record, field = t_att["field"].rsplit('.', 1) + record = self.eval_object(record) inner = "" - field = t_att["field"] field_type = record._model._all_columns.get(field).column._type try: if field_type == 'many2one': From f8a71e4a87d139cb19d2eb4e949ee90cac7b770c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 4 Aug 2013 22:27:20 +0200 Subject: [PATCH 2/3] [FIX] eval t-field bzr revid: fp@openerp.com-20130804202720-4bxsshh2ykzkjo7a --- openerp/tools/qweb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py index d13e7491aa5..08d065ae2b4 100644 --- a/openerp/tools/qweb.py +++ b/openerp/tools/qweb.py @@ -280,7 +280,7 @@ class QWebXml(object): """ eg: +1 555 555 8069""" record, field = t_att["field"].rsplit('.', 1) - record = self.eval_object(record) + record = self.eval_object(record, v) inner = "" field_type = record._model._all_columns.get(field).column._type From b8f5817c8b50d9908027d644d63eecf3a7eea5ac Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 4 Aug 2013 22:52:15 +0200 Subject: [PATCH 3/3] [IMP] branding distribution in views bzr revid: fp@openerp.com-20130804205215-0g8fvzy8aducrc3v --- openerp/addons/base/ir/ir_ui_view.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 82431ec4ef6..4743b6888da 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -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)