summaryrefslogtreecommitdiff
path: root/addons/web/static/src/xml
diff options
context:
space:
mode:
authorAntony Lesuisse <al@openerp.com>2012-12-19 03:54:29 +0100
committerAntony Lesuisse <al@openerp.com>2012-12-19 03:54:29 +0100
commit061dc8ed4822cf3c5ca0da61015d54e83015b15a (patch)
tree113f9032440c286fe10cee64d0a6fa4d9e6d054f /addons/web/static/src/xml
parent9013f54e145acc958f918cd587e6d8d81cbed171 (diff)
parent7826bd85f8e2bee372b3e0df9f2a30eb84a116b6 (diff)
[MERGE] merge trunk-owp-648324
bzr revid: al@openerp.com-20121219025429-h4wn6tlhtvn2xpzg
Diffstat (limited to 'addons/web/static/src/xml')
-rw-r--r--addons/web/static/src/xml/base.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 5afadaeffd0..82714c22aa8 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -36,11 +36,11 @@
<t t-name="CrashManager.warning">
<table cellspacing="0" cellpadding="0" border="0" class="oe_dialog_warning">
<tr>
- <td><img t-att-src='_s + "/web/static/src/img/warning.png"' class="oe_dialog_icon"/></td>
+ <td class="oe_dialog_icon"><img t-att-src='_s + "/web/static/src/img/warning.png"'/></td>
<td>
<p>
<t t-js="d">
- var message = d.message ? d.message : d.error.data.fault_code;
+ var message = d.error.message ? d.error.message : d.error.data.fault_code;
d.html_error = context.engine.tools.html_escape(message)
.replace(/\n/g, '<br/>');
</t>