diff options
| author | Thibault Delavallée <tde@odoo.com> | 2017-12-04 13:49:50 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2017-12-28 12:39:54 +0100 |
| commit | fdb7a8db267e97edaf48b37f65f09ee235b98b5a (patch) | |
| tree | dc7a0898ca41c1b6f176d44776fc38f0e2e99014 | |
| parent | f33ea46ceffb369995f1f0e19b35b03b242e6dac (diff) | |
[FIX][IMP] mail: remove cdata of notification email data and fix some invalid stuff
Using xml type it allows to have a cleaner view of the content in a classic
code editor. This commit also fixes some xml-related invalid stuff that
does not impact the notification email rendering.
| -rw-r--r-- | addons/mail/data/mail_data.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 34789916a48..ad6f58665c2 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -70,12 +70,12 @@ <field name="subject">${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}</field> <field name="model_id" ref="mail.model_mail_message"/> <field name="auto_delete" eval="True"/> - <field name="body_html"><![CDATA[ -% set company = ctx.get('company', user.company_id) + <field name="body_html" type="xml"> <div> +% set company = ctx.get('company', user.company_id) % if ctx.get('has_button_access'): -<div itemscope itemtype="http://schema.org/EmailMessage"> - <div itemprop="potentialAction" itemscope itemtype="http://schema.org/ViewAction"> +<div itemscope="itemscope" itemtype="http://schema.org/EmailMessage"> + <div itemprop="potentialAction" itemscope="itemscope" itemtype="http://schema.org/ViewAction"> <link itemprop="target" href="${ctx['button_access']['url']}"/> <link itemprop="url" href="${ctx['button_access']['url']}"/> <meta itemprop="name" content="View ${ctx['model_name']}"/> @@ -111,13 +111,13 @@ % endif </td> <td valign="center" align="right"> - <img src="/logo.png?company=${company.id}" style="padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;" alt="${company.name}"> + <img src="/logo.png?company=${company.id}" style="padding: 0px; margin: 0px; height: auto; max-width: 80px; max-height: 40px;" alt="${company.name}"/> </td> </tr> <tr> <td colspan="2" style="text-align:center;"> <hr width="100%" - style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;"> + style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin:10px 0;"/> % if ctx.get('subtype') and ctx.get('subtype').internal: <p style="background-color: #f2dede; padding: 5px; margin-bottom: 16px;"> <strong>Internal communication</strong>: Replying will post an internal note. Followers won't receive any email notification. @@ -155,7 +155,7 @@ using <a target="_blank" href="https://www.odoo.com" style="text-decoration:none; color: #875A7B;">Odoo</a>. </p> -</div>]]></field> +</div></field> </record> </data> |