Merge lp:~openerp-dev/openerp-web/6.1-web-custo-mmu-access-denied-email into lp:~openerp-dev/openerp-web/6.1-web-custo-tfr

[Max (OpenERP)]

Unmerged revisions

2386. By Max Mumford (<email address hidden>) on 2012-11-14

[IMP] Remove HTML tag stripping to let us have a clickable email link in the access denied error message

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2012-09-07 14:39:01 +0000
+++ addons/web/static/src/xml/base.xml	2012-11-15 08:44:26 +0000
@@ -237,8 +237,7 @@
             <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)
-                        .replace(/\n/g, '<br/>');
+                    d.html_error = message.replace(/\n/g, '<br/>');
                 </t>
                 <t t-raw="html_error"/>
             </p>