diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-09-04 15:28:30 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-09-04 15:28:30 +0200 |
| commit | 146798a4efdf04cbb4ff0b9896773f54589da8d2 (patch) | |
| tree | d6cfb18c8850152ac6c37ab236bb8d96b5f9dc3a /addons/mail/static/src/xml | |
| parent | 85e52d1f86dfe60f1ca43fb81c7fb2c72d21cd95 (diff) | |
| parent | e6b85985a5eea079b69d29f8a63ed714fb7a6646 (diff) | |
merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130904132830-zn80fl2ut6rbpmhw
Diffstat (limited to 'addons/mail/static/src/xml')
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 1be9754e1c7..e6c84eaa5df 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="'"' + widget.parent_thread.parent_message.record_name + '"'"> + <t t-if="widget.parent_thread.parent_message.record_name"> Followers of <t t-raw="'"' + widget.parent_thread.parent_message.record_name + '"'"/> </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&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="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&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> |