diff options
| author | Thibault Delavallée <tde@odoo.com> | 2018-02-12 13:08:33 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2018-02-12 13:08:33 +0100 |
| commit | a65b0b23635b335aa231beb84f32af8a7ae44bb6 (patch) | |
| tree | ef112060394b953eb179f86ad83ad0ecfd515e47 /addons/mail/data | |
| parent | 4cfda8cef9b7048b3999d155177fc068e3849ade (diff) | |
| parent | 29955b21091ad8891a0e306477b1a197c510b15e (diff) | |
[MERGE][FIX] mail: fix notification emails not containing global links for URLs and images
See sub commits for more details. Was task 55210. #Closes #22940 .
Diffstat (limited to 'addons/mail/data')
| -rw-r--r-- | addons/mail/data/mail_data.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index a6c9b62e019..fa48b112aa8 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -68,12 +68,12 @@ <div> <div t-if="has_button_access" 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']}"/> + <link itemprop="target" t-att-href="button_access['url']"/> + <link itemprop="url" t-att-href="button_access['url']"/> + <meta itemprop="name" t-att-content="button_access['title']"/> </div> </div> -<div t-if="has_button_access or len(actions) > 0 or is_notification" +<div t-if="has_button_access or len(actions) > 0 or not is_discussion" summary="o_mail_notification" style="padding: 0px; width:600px;"> <table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin-top: 5px;"> <tbody><tr> @@ -116,9 +116,9 @@ <p style="color: #555555;"> Sent by <a t-if="website_url" t-att-href="website_url" style="text-decoration:none; color: #875A7B;"> - <span t-esc="company_name"/> + <span t-esc="company.name"/> </a> - <span t-if="not website_url" t-esc="company_name"/> + <span t-if="not website_url" t-esc="company.name"/> using <a target="_blank" href="https://www.odoo.com" style="text-decoration:none; color: #875A7B;">Odoo</a>. </p> |