diff --git a/addons/base/static/qweb/qweb-test.js.html b/addons/base/static/qweb/qweb-test.js.html index 97d8828f40c..3dc9e0a7ff5 100644 --- a/addons/base/static/qweb/qweb-test.js.html +++ b/addons/base/static/qweb/qweb-test.js.html @@ -31,6 +31,9 @@ equals("ok", render('esc-variable', {ok: 'ok'}), "Render a string variable"); equals("<ok>", render('esc-toescape', {ok: ''}), "Render a string with data to escape"); }); + test("Formatted escaped data output", function () { + equals("ok", render('escf-noformat-literal', {}), "Render a literal string"); + }); }); diff --git a/addons/base/static/qweb/qweb-test.xml b/addons/base/static/qweb/qweb-test.xml index 8669f3f243c..f3ac3e8f5ec 100644 --- a/addons/base/static/qweb/qweb-test.xml +++ b/addons/base/static/qweb/qweb-test.xml @@ -8,4 +8,9 @@ + + + + + diff --git a/addons/base/static/qweb/qweb.js b/addons/base/static/qweb/qweb.js index 967b1976c85..e8a614f4104 100644 --- a/addons/base/static/qweb/qweb.js +++ b/addons/base/static/qweb/qweb.js @@ -180,7 +180,7 @@ var QWeb = { return this.escape_text(this.eval_str(t_att["esc"], v)); }, render_tag_escf:function(e, t_att, g_att, v) { - return this.escape_text(this.eval_format(t_att["esc"], v)); + return this.escape_text(this.eval_format(t_att["escf"], v)); }, render_tag_if:function(e, t_att, g_att, v) { return this.eval_bool(t_att["if"], v) ? this.render_element(e, t_att, g_att, v) : "";