From d19c8e5e2c2db389bd10fca2b30d4b9b61545151 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 30 Nov 2012 17:01:57 +0100
Subject: [PATCH] [IMP] mail: don't show the record_name on link with option
 show_link=false

bzr revid: chm@openerp.com-20121130160157-0tkavi31bn72xwhg
---
 addons/mail/static/src/xml/mail.xml | 18 +++++++++---------
 addons/portal/portal_data.xml       |  4 ++--
 addons/portal/portal_view.xml       |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 77c478c1bf0..640d6c031a5 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -117,8 +117,8 @@
             <t t-set="inc" t-value="0"/>
             <t t-if="widget.partner_ids.length" 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_partner" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
-                    <t t-if="!widget.options.show_link_partner" t-raw="partner[1]"/>
+                    <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-if="widget.partner_ids.length>=3">
@@ -198,10 +198,10 @@
         <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type}">
 
             <div class='oe_msg_left'>
-                <a t-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                <a t-if="widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
                     <img class="oe_msg_icon" t-att-src="widget.avatar"/>
                 </a>
-                <img t-if="!widget.options.show_link_partner" class="oe_msg_icon" t-att-src="widget.avatar"/>
+                <img t-if="!widget.options.show_link" class="oe_msg_icon" t-att-src="widget.avatar"/>
             </div>
 
             <div class="oe_msg_center">
@@ -215,7 +215,7 @@
                 <!-- message itself -->
                 <div class="oe_msg_content">
                     <h1 t-if="(widget.show_record_name or widget.subject) and !widget.thread_level" class="oe_msg_title">
-                        <a t-if="widget.show_record_name" class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a>
+                        <a t-if="widget.options.show_link and widget.show_record_name" class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a><span t-if="!widget.options.show_link and widget.show_record_name"><t t-raw="widget.record_name"/></span><t t-if="widget.show_record_name">: </t>
                         <t t-if="widget.subject" t-raw="widget.subject"/>
                     </h1>
                     <div class="oe_msg_body">
@@ -226,8 +226,8 @@
                     <t t-if="widget.attachment_ids.length > 0">
                         <div class="oe_msg_attachment_list"></div>
                     </t>
-                    <a t-if="widget.author_id and widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
-                    <span t-if="widget.author_id and !widget.options.show_link_partner"><t t-raw="widget.author_id[1]"/></span>
+                    <a t-if="widget.author_id and widget.options.show_link" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-if="widget.author_id and !widget.options.show_link"><t t-raw="widget.author_id[1]"/></span>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
                     <span class='oe_subtle'>•</span>
@@ -246,8 +246,8 @@
                             <t t-set="inc" t-value="0"/>
                             <t t-if="widget.partner_ids.length" 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_partner" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
-                                    <t t-if="!widget.options.show_link_partner" t-raw="partner[1]"/>
+                                    <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-if="widget.partner_ids.length>=3">
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 9e2bff2b962..75fc0359e9c 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -22,7 +22,7 @@
                     'default_model': 'mail.group',
                     'default_res_id': ref('company_news_feed'),
                 },
-                'show_link_partner': False,
+                'show_link': False,
                 'res_model': 'mail.message',
                 'thread_level': 1,
             }"/>
@@ -54,7 +54,7 @@
                     'default_model': 'mail.group',
                     'default_res_id': ref('company_jobs'),
                 },
-                'show_link_partner': False,
+                'show_link': False,
                 'res_model': 'mail.message',
                 'thread_level': 1,
             }"/>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index b7765e63ffd..8c361312433 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -62,7 +62,7 @@
                   ('favorite_user_ids', 'not in', [uid])
                 ],
                 'show_compose_message': False,
-                'show_link_partner': False,
+                'show_link': False,
                 'view_mailbox': True,
                 'view_inbox': True,
                 'read_action': 'read'