odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] from trunk 

bzr revid: chm@openerp.com-20130322085746-ti90bxkit771gmtg
This commit is contained in:
Christophe Matthieu 2013-03-22 09:57:46 +01:00
parent cc4b2bbb27 6a696ba673
commit 797dde8740
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/static/src/xml/base.xml
View File

@ -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>