Odoo Web (MOVED TO GITHUB)

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

  1. 6.1-web-custo-mmu-access-denied-email
  2. Merge into 6.1-web-custo-tfr
Proposed by Max (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/6.1-web-custo-mmu-access-denied-email
Merge into: lp:~openerp-dev/openerp-web/6.1-web-custo-tfr
Diff against target: 13 lines (+1/-2)
1 file modified
addons/web/static/src/xml/base.xml (+1/-2)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/6.1-web-custo-mmu-access-denied-email
Reviewer Review Type Date Requested Status
tfr (Openerp) Pending
Review via email: mp+134409@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

2386. By Max Mumford (<email address hidden>)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/xml/base.xml'
2--- addons/web/static/src/xml/base.xml 2012-09-07 14:39:01 +0000
3+++ addons/web/static/src/xml/base.xml 2012-11-15 08:44:26 +0000
4@@ -237,8 +237,7 @@
5 <p>
6 <t t-js="d">
7 var message = d.message ? d.message : d.error.data.fault_code;
8- d.html_error = context.engine.tools.html_escape(message)
9- .replace(/\n/g, '<br/>');
10+ d.html_error = message.replace(/\n/g, '<br/>');
11 </t>
12 <t t-raw="html_error"/>
13 </p>

Subscribers

People subscribed via source and target branches

to all changes: