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

[IMP] move translate flag out of base qweb rendering 

bzr revid: xmo@openerp.com-20131008092207-m27ox8pebl36a45p
This commit is contained in:
Xavier Morel 2013-10-08 11:22:07 +02:00
parent d414f8c7cf
commit 273f62bc78
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openerp/addons/base/ir/ir_qweb.py
View File

@ -434,7 +434,6 @@ class FieldConverter(osv.AbstractModel):
('data-oe-id', record.id),
('data-oe-field', field_name),
('data-oe-type', field_type),
('data-oe-translate', '1' if column.translate else '0'),
('data-oe-expression', t_att['field']),
]

6
openerp/tests/addons/test_converter/tests/test_html.py
View File

@ -106,7 +106,7 @@ class TestCurrencyExport(TestExport):
converted,
'<span data-oe-model="{obj._model._name}" data-oe-id="{obj.id}" '
'data-oe-field="value" data-oe-type="currency" '
'data-oe-translate="0" data-oe-expression="obj.value">'
'data-oe-expression="obj.value">'
'<span class="oe_currency_value">0.12</span>'
' {symbol}</span>'.format(
obj=obj,
@ -124,7 +124,7 @@ class TestCurrencyExport(TestExport):
converted,
'<span data-oe-model="{obj._model._name}" data-oe-id="{obj.id}" '
'data-oe-field="value" data-oe-type="currency" '
'data-oe-translate="0" data-oe-expression="obj.value">'
'data-oe-expression="obj.value">'
'{symbol} '
'<span class="oe_currency_value">0.12</span>'
'</span>'.format(
@ -144,7 +144,7 @@ class TestCurrencyExport(TestExport):
converted,
'<span data-oe-model="{obj._model._name}" data-oe-id="{obj.id}" '
'data-oe-field="value" data-oe-type="currency" '
'data-oe-translate="0" data-oe-expression="obj.value">'
'data-oe-expression="obj.value">'
'<span class="oe_currency_value">0.12</span>'
' {symbol}</span>'.format(
obj=obj,

2
openerp/tests/test_qweb.py
View File

@ -31,7 +31,6 @@ class TestQWebTField(common.TransactionCase):
result,
'<span data-oe-model="res.company" data-oe-id="%d" '
'data-oe-field="name" data-oe-type="char" '
'data-oe-translate="0" '
'data-oe-expression="company.name">%s</span>' % (
company_id,
"My Test Company",))
@ -54,7 +53,6 @@ class TestQWebTField(common.TransactionCase):
result,
'<span data-oe-model="res.company" data-oe-id="%d" '
'data-oe-field="name" data-oe-type="char" '
'data-oe-translate="0" '
'data-oe-expression="company.name">%s</span>' % (
company_id,
cgi.escape(s.encode('utf-8')),))