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: [PATCH] [FIX]: Fix private message partnerid problem and display and
 when no author

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

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 5d54a6acc48..1715b7b0368 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1235,6 +1235,7 @@ openerp.mail = function (session) {
             this.last_id = datasets.last_id || false;
             this.parent_id = datasets.parent_id || false;
             this.is_private = datasets.is_private || false;
+            this.is_author = datasets.is_author ||  false,
             this.author_id = datasets.author_id || false;
             this.thread_level = (datasets.thread_level+1) || 0;
             datasets.partner_ids = datasets.partner_ids || [];
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>