diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-03-22 09:57:46 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-03-22 09:57:46 +0100 |
| commit | 797dde87409eb0cc869c2e4870b0d9e3fd4412ed (patch) | |
| tree | 40d0420b9168e2301da598e55cb4220ae3d4a295 /addons/web/static/src/xml/base.xml | |
| parent | cc4b2bbb2729077eea4dde9282eb696ce83188d4 (diff) | |
| parent | 6a696ba673f9d27f78490fdbbf5d899de21106b7 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130322085746-ti90bxkit771gmtg
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -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 623fdc2de53..65d70b64666 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> |