summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/xml/mail.xml
diff options
context:
space:
mode:
authorAtul Patel (OpenERP) <atp@tinyerp.com>2013-07-23 11:19:26 +0530
committerAtul Patel (OpenERP) <atp@tinyerp.com>2013-07-23 11:19:26 +0530
commit5d4f89f9d67b24446c5c88174bc6d61051599adb (patch)
treebc890999dd509826cace3a90f8b74519bc344e1d /addons/mail/static/src/xml/mail.xml
parent70d47d809a4b7e5602a518cd5959055606d85238 (diff)
[IMP]: check is_author condition
bzr revid: atp@tinyerp.com-20130723054926-4t0whshbgcrkql3h
Diffstat (limited to 'addons/mail/static/src/xml/mail.xml')
-rw-r--r--addons/mail/static/src/xml/mail.xml5
1 files changed, 3 insertions, 2 deletions
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>