From 295d807aa54e99753d5127b626db1901ce11ca5b Mon Sep 17 00:00:00 2001
From: "Mehul Mehta (OpenERP Trainee)" <mehulmehta008@gmail.com>
Date: Tue, 16 Jul 2013 17:41:24 +0800
Subject: [IMP] change a reply private discussion Document in chatter and
 remove a author notified of its own messages

bzr revid: mehulmehta008@gmail.com-20130716094124-ksigo91x3njgdj4f
---
 addons/mail/static/src/xml/mail.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 94ee1ff452f..318a0f5860a 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -121,21 +121,23 @@
             To:
             <t t-if="!widget.is_private">
                 <span class="oe_all_follower">
-                    <t t-if="widget.parent_thread.parent_message.record_name" t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'">
+                    <t t-if="widget.parent_thread.parent_message.record_name">
                         Followers of <t t-raw="'&quot;' + widget.parent_thread.parent_message.record_name + '&quot;'"/>
                     </t>
                     <t t-if="!widget.parent_thread.parent_message.record_name and widget.options.view_inbox">My Followers</t>
                     <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
-            <t t-if="!widget.is_private and (widget.partner_ids.length or (widget.author_id and widget.author_id[0]))"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-foreach="widget.partner_ids" t-as="partner">
-                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
-                    <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
-                    <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
-                </span>
-                <t t-set="inc" t-value="inc+1"/>
+                <t t-if="partner[0] != widget.author_id[0]">
+                    <t t-if="!widget.is_private"> and </t>
+	                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
+	                    <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
+	                    <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
+	                </span>
+	                <t t-set="inc" t-value="inc+1"/>
+                </t>
             </t>
             <t t-if="widget.partner_ids.length > 3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>
-- 
cgit v1.2.3


From 5d4f89f9d67b24446c5c88174bc6d61051599adb Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 23 Jul 2013 11:19:26 +0530
Subject: [IMP]: check is_author condition

bzr revid: atp@tinyerp.com-20130723054926-4t0whshbgcrkql3h
---
 addons/mail/static/src/xml/mail.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 318a0f5860a..b14b5a5d3ce 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -128,10 +128,10 @@
                     <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
+            <t t-if="!widget.is_private and widget.is_author"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-foreach="widget.partner_ids" t-as="partner">
-                <t t-if="partner[0] != widget.author_id[0]">
-                    <t t-if="!widget.is_private"> and </t>
+                <t t-if="widget.is_private or (widget.is_author and widget.author_id[0] != partner[0])">
 	                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
 	                    <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
 	                    <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
@@ -139,6 +139,7 @@
 	                <t t-set="inc" t-value="inc+1"/>
                 </t>
             </t>
+             <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-if="!widget.is_author" t-raw="widget.author_id[2]"/></a>
             <t t-if="widget.partner_ids.length > 3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
-- 
cgit v1.2.3


From 48c68c3a997a2bc1d32bd6aeb6a47a03cf0eb924 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 23 Jul 2013 11:25:11 +0530
Subject: [FIX]: Fix private message partnerid problem and display and when no
 author

bzr revid: atp@tinyerp.com-20130723055511-edtutz2au78rcinx
---
 addons/mail/static/src/xml/mail.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index b14b5a5d3ce..05a3b61d9f3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -128,7 +128,7 @@
                     <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
-            <t t-if="!widget.is_private and widget.is_author"> and </t>
+            <t t-if="!widget.is_private and !widget.is_author"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-foreach="widget.partner_ids" t-as="partner">
                 <t t-if="widget.is_private or (widget.is_author and widget.author_id[0] != partner[0])">
@@ -139,7 +139,7 @@
 	                <t t-set="inc" t-value="inc+1"/>
                 </t>
             </t>
-             <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-if="!widget.is_author" t-raw="widget.author_id[2]"/></a>
+             <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-if="!widget.is_private and !widget.is_author" t-raw="widget.author_id[2]"/></a>
             <t t-if="widget.partner_ids.length > 3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
-- 
cgit v1.2.3


From 2706328ca43a02196bd1b4766d2e04718a8cf1ed Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 25 Jul 2013 12:49:39 +0530
Subject: [IMP] mail: Pass current user partner id into datasets and get it
 into template. add author also for private mail.

bzr revid: atp@tinyerp.com-20130725071939-9lmuhfgte987nu03
---
 addons/mail/static/src/xml/mail.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'addons/mail/static/src/xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 05a3b61d9f3..147671514bc 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -128,18 +128,17 @@
                     <t t-if="!widget.parent_thread.parent_message.record_name and !widget.options.view_inbox">Followers of this document</t>
                 </span>
             </t>
-            <t t-if="!widget.is_private and !widget.is_author"> and </t>
             <t t-set="inc" t-value="0"/>
             <t t-foreach="widget.partner_ids" t-as="partner">
-                <t t-if="widget.is_private or (widget.is_author and widget.author_id[0] != partner[0])">
+                <t t-if="widget.is_private or (widget.user_pid != partner[0])">
+                    <t t-if="!widget.is_private and inc==0"> and </t>
 	                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
 	                    <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
 	                    <t t-if="!widget.options.show_link" t-raw="partner[1]"/>
 	                </span>
 	                <t t-set="inc" t-value="inc+1"/>
-                </t>
+	            </t>
             </t>
-             <a t-if="widget.author_id and widget.options.show_link and widget.author_id[0]" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-if="!widget.is_private and !widget.is_author" t-raw="widget.author_id[2]"/></a>
             <t t-if="widget.partner_ids.length > 3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length - 3"/> others...</a></span>
                 <a class="oe_more_hidden">&lt;&lt;&lt;</a>
-- 
cgit v1.2.3