diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-06-09 13:28:06 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-06-09 13:28:06 +0200 |
| commit | b6c7d71899529b6786884d7b8659946d20e97516 (patch) | |
| tree | 5096788b891bbf5b887c33b5d77237b0eee5a5ae /addons/web/static/src/xml/base.xml | |
| parent | 6edc0f7e6b4a9f506eceff4c2cda73efdd469ef9 (diff) | |
| parent | cd1a8f625276e3c40b320df73e4041004c77aea8 (diff) | |
[MERGE] forward port branch 10.0 up to cd1a8f62527
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ba3106c69b1..e87a6702de4 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -22,7 +22,7 @@ <div t-name="CrashManager.warning" class="o_dialog_warning"> <t t-js="d"> - var message = d.message ? d.message : d.error.data.message; + var message = (d.message !== undefined) ? d.message : d.error.data.message; d.html_error = context.engine.tools.html_escape(message).replace(/\n/g, '<br/>'); </t> <t t-raw="html_error"/> |