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

[FIX] base: allow to t-raw="0" with empty content

Browse Source 
Before this commit, when doing `<t t-raw="0"/>` to print the t-called
content, it was printing "[]" if the content was left empty.

closes odoo/odoo#31668

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
This commit is contained in:
Christophe Matthieu
2019-03-07 15:06:41 +00:00
committed by qsm-odoo
parent 05c095a73b
commit b1d80841fc
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
odoo/addons/base/models/qweb.py
+19 -25
View File
@@ -1660,32 +1660,26 @@ class QWeb(object):
def _compile_expr0(self, expr):
if expr == "0":
# values.get(0) and u''.join(values[0])
return ast.BoolOp(
op=ast.And(),
values=[
ast.Call(
func=ast.Attribute(
value=ast.Name(id='values', ctx=ast.Load()),
attr='get',
ctx=ast.Load()
),
args=[ast.Num(0)], keywords=[],
starargs=None, kwargs=None
# u''.join(values.get(0, []))
return ast.Call(
func=ast.Attribute(
value=ast.Str(u''),
attr='join',
ctx=ast.Load()
),
args=[
ast.Call(
func=ast.Attribute(
value=ast.Name(id='values', ctx=ast.Load()),
attr='get',
ctx=ast.Load()
),
ast.Call(
func=ast.Attribute(
value=ast.Str(u''),
attr='join',
ctx=ast.Load()
),
args=[
self._values_var(ast.Num(0), ctx=ast.Load())
],
keywords=[], starargs=None, kwargs=None
)
]
)
args=[ast.Num(0), ast.List(elts=[], ctx=ast.Load())], keywords=[],
starargs=None, kwargs=None
)
],
keywords=[], starargs=None, kwargs=None
)
return self._compile_expr(expr)
def _compile_format(self, f):