diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-21 10:01:02 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-21 10:01:02 +0100 |
| commit | 6a696ba673f9d27f78490fdbbf5d899de21106b7 (patch) | |
| tree | 36945616f94bc9b57090e67cd35fefd3e667464d /addons/web/static/src | |
| parent | c0c2bcd62e2947dd47fafbee380644df86a4ff08 (diff) | |
| parent | a5ee9e58194219abe33f24464e18ac26a3515823 (diff) | |
[MERGE] [FIX] Web: errors are displayed again
bzr revid: tde@openerp.com-20130321090102-jzj80cfo6ko5x1dj
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5ac7e5c3ef6..bcd5763a37e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -40,11 +40,11 @@ <td> <p> <t t-js="d"> - var message = d.message ? d.message : d.error.data.fault_code; - d.html_error = context.engine.tools.html_escape(message) + var message = d.error.data.message || d.error.data.fault_code; + d.error.html_error = context.engine.tools.html_escape(message) .replace(/\n/g, '<br/>'); </t> - <t t-raw="html_error"/> + <t t-raw="error.html_error"/> </p> </td> </tr> |