diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-04-11 11:23:06 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-04-11 11:23:06 +0200 |
| commit | 1d12a480c344ce96f3935187e5efa52131e6f2da (patch) | |
| tree | 1eda60f28b8e5b910bebfc438d42e30a80b341b6 /addons/web/static/src/xml | |
| parent | 67452d290eac4e26a0d940510960e2cdc36c657b (diff) | |
| parent | aaed0ccd43b4697e35c9362fe18796685102d9ce (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20130411092306-wypa8h3kh1v5q8qn
Diffstat (limited to 'addons/web/static/src/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 d57dc2107f5..4a5a7527e28 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.error.data.message || d.error.data.fault_code; - d.error.html_error = context.engine.tools.html_escape(message) + var message = d.message ? d.message : d.error.data.message; + d.html_error = context.engine.tools.html_escape(message) .replace(/\n/g, '<br/>'); </t> - <t t-raw="error.html_error"/> + <t t-raw="html_error"/> </p> </td> </tr> |