From fcb51faa9f5a65bac313963673549cf5c10767c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Fri, 16 Sep 2016 09:34:30 +0200
Subject: [FIX] mail: fix display of actions button in notification email

---
 addons/mail/data/mail_data.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 3645ba2e337..6dda90ccdd4 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -77,30 +77,30 @@
 </div>
 % endif
 % if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access'):
-<div summary="o_mail_notification">
-<table cellspacing="0" cellpadding="0" border="0" style="width: 100%; margin-top: 5px;">
+<div summary="o_mail_notification" style="padding: 0px; width:600px;">
+<table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin-top: 5px;">
 <tbody><tr>
     <td valign="center">
-        % if ctx.get('button_access') or ctx.get('button_follow') or ctx.get('button_unfollow'):
-        <a href="${ctx['button_access']['url']}" style="padding: 8px 12px; font-size: 12px; text-decoration: none; color: #FFFFFF; text-decoration:none !important; font-weight: 400; background-color: #a24689; border: 0px solid #a24689; border-radius:3px">${ctx['button_access']['title']}</a>
+        % if ctx.get('button_access'):
+        <a href="${ctx['button_access']['url']}" style="padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #a24689; border: 0px solid #a24689; border-radius:3px">${ctx['button_access']['title']}</a>
         % endif
 
         % if ctx.get('button_follow'):
-        % if ctx.get('actions'):
+        % if ctx.get('button_access'):
            |
         % endif
-        <a href="${ctx['button_follow']['url']}" style="text-decoration:none; color: #a24689; text-decoration:none !important;">${ctx['button_follow']['title']}</a>
+        <a href="${ctx['button_follow']['url']}" style="color: #a24689; text-decoration: none !important;">${ctx['button_follow']['title']}</a>
         % elif ctx.get('button_unfollow'):
-        % if ctx.get('actions'):
+        % if ctx.get('button_access'):
            |
         % endif
-        <a href="${ctx['button_unfollow']['url']}" style="text-decoration:none; color: #a24689; text-decoration:none !important;">${ctx['button_unfollow']['title']}</a>
+        <a href="${ctx['button_unfollow']['url']}" style="color: #a24689; text-decoration: none !important;">${ctx['button_unfollow']['title']}</a>
         % endif
 
         % if ctx.get('actions'):
         % for action in ctx['actions']:
         |
-        <a href="${action['url']}" style="text-decoration:none; color: #a24689; text-decoration:none !important;">${action['title']}</a>
+        <a href="${action['url']}" style="color: #a24689; text-decoration:none !important;">${action['title']}</a>
         % endfor
         % endif
     </td>
-- 
cgit v1.2.3


From 458aaca328491a993f7458520b047869a770325e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Fri, 16 Sep 2016 09:34:43 +0200
Subject: [IMP] mail: reimplement grouping of notification recipients

There is now a single method easier to inherit to add specific behavior
for the display of access button as well as actions buttons. All addons
using this mechanism are updated accordingly.
---
 addons/mail/data/mail_data.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 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 6dda90ccdd4..c229ef0f54e 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -67,7 +67,7 @@
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
 <div>
-% if ctx.get('button_access'):
+% if ctx.get('has_button_access'):
 <div itemscope itemtype="http://schema.org/EmailMessage">
     <div itemprop="potentialAction" itemscope itemtype="http://schema.org/ViewAction">
         <link itemprop="target" href="${ctx['button_access']['url']}"/>
@@ -76,22 +76,22 @@
     </div>
 </div>
 % endif
-% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('button_access'):
+% if not ctx['is_discussion'] or not len(ctx['actions']) == 0 or ctx.get('has_button_access'):
 <div summary="o_mail_notification" style="padding: 0px; width:600px;">
 <table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin-top: 5px;">
 <tbody><tr>
     <td valign="center">
-        % if ctx.get('button_access'):
+        % if ctx.get('has_button_access'):
         <a href="${ctx['button_access']['url']}" style="padding: 8px 12px; font-size: 12px; color: #FFFFFF; text-decoration: none !important; font-weight: 400; background-color: #a24689; border: 0px solid #a24689; border-radius:3px">${ctx['button_access']['title']}</a>
         % endif
 
-        % if ctx.get('button_follow'):
-        % if ctx.get('button_access'):
+        % if ctx.get('has_button_follow'):
+        % if ctx.get('has_button_access'):
            |
         % endif
         <a href="${ctx['button_follow']['url']}" style="color: #a24689; text-decoration: none !important;">${ctx['button_follow']['title']}</a>
-        % elif ctx.get('button_unfollow'):
-        % if ctx.get('button_access'):
+        % elif ctx.get('has_button_unfollow'):
+        % if ctx.get('has_button_access'):
            |
         % endif
         <a href="${ctx['button_unfollow']['url']}" style="color: #a24689; text-decoration: none !important;">${ctx['button_unfollow']['title']}</a>
-- 
cgit v1.2.3