diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-22 10:09:51 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-22 10:09:51 +0100 |
| commit | 93eaf80e068109cf4d6cb34ffd8eb1eb2ae3e90c (patch) | |
| tree | d6201aa5b671d6d402c0965776500655bf901e63 /addons/web | |
| parent | 6d52a622627770c5685532ed964c148eae859f8f (diff) | |
| parent | 6a696ba673f9d27f78490fdbbf5d899de21106b7 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130322090951-fvgcj1xyhtvwcciu
Diffstat (limited to 'addons/web')
| -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> |