From 94f2f6241b65c746baf13adaf5f60567877acc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Thu, 8 Feb 2018 16:09:16 +0100
Subject: [FIX] mail: fix wrongly QWeb-converted bits of notification emails

Notification emails now use QWeb to be rendered instead of jinja-based
mail.template since 2f7593761c1ea432e2e58045150150356816f868. Part of the notification emails was not working
anymore since its syntax was still using jinja. This commit fixes that.

This commit also removes strange ';' that should not be part of python code
as well as an unnecessary variable propagation.
---
 addons/mail/data/mail_data.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/mail/data/mail_data.xml')

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) &gt; 0 or is_notification"
+<div t-if="has_button_access or len(actions) &gt; 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>
-- 
cgit v1.2.3