From e7cb3dcaa8a26b254a78d07cb0eb95946440edaa Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 1 Dec 2015 08:58:28 +0100
Subject: [FIX] mail: don't redirect to user's own partner form view

Clicking on the author of a message opens a DM with the corresponding user if
there is one, and opens the corresponding partner's form view otherwise.

When the author is the current user, obviously we don't want to open a DM with
ourself, but we probably don't want to open our partner form view either, which
was exactly the behavior before this rev.
---
 addons/mail/static/src/xml/thread.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index ebf6687c1a3..48ba98659b2 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -53,7 +53,7 @@
                         t-att-src="message.avatar_src"
                         data-oe-model="res.partner"
                         t-att-data-oe-id="message.author_id[0]"
-                        class="o_thread_message_avatar o_mail_redirect"/>
+                        t-attf-class="o_thread_message_avatar #{message.author_redirect ? 'o_mail_redirect' : ''}"/>
                 </t>
                 <t t-if="message.mailto || !message.author_id[0]">
                     <img t-if="message.avatar_src &amp;&amp; message.display_author"
@@ -80,7 +80,7 @@
                     </strong>
                     <strong t-if="!message.mailto &amp;&amp; message.author_id[0]"
                             data-oe-model="res.partner" t-att-data-oe-id="message.author_id[0]"
-                            class="o_mail_redirect">
+                            t-attf-class="#{message.author_redirect ? 'o_mail_redirect' : ''}">
                         <t t-esc="message.displayed_author"/>
                     </strong>
                     <strong t-if="!message.mailto &amp;&amp; !message.author_id[0]">
-- 
cgit v1.2.3


From 27a455fc9255359058d1dc27cdc9ab89624b1cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Tue, 1 Dec 2015 16:00:28 +0100
Subject: [IMP] mail: various improvement

- don't display subject for messages coming from chatter
- better tooltip on the leave channel button in client action sidebar
- don't squash nearby messages in chatter
- reduce margin of date separator in chat windows
---
 addons/mail/static/src/xml/client_action.xml | 2 +-
 addons/mail/static/src/xml/thread.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml
index e3c2c1aeee2..11b32ee0e8d 100644
--- a/addons/mail/static/src/xml/client_action.xml
+++ b/addons/mail/static/src/xml/client_action.xml
@@ -83,7 +83,7 @@
                 <i t-if="channel.mass_mailing" class="fa fa-envelope-o"/>
                 <t t-call="mail.chat.SidebarNeedaction"/>
                 <span t-attf-class="fa fa-times pull-right o_mail_partner_unpin #{counter ? 'hide' : ''}"
-                      t-att-title="_t('Close')" t-att-data-channel-id="channel.id"/>
+                      t-att-title="_t('Leave this channel')" t-att-data-channel-id="channel.id"/>
             </div>
         </t>
         <div t-if="!disable_add_channel" class="o_mail_add_channel" t-attf-data-type="#{channel_type}">
diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index 48ba98659b2..f1a364999b5 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -111,7 +111,7 @@
                     </t>
                     <t t-call="mail.ChatThread.MessageTracking"/>
                 </t>
-                <p t-if="options.display_subject &amp;&amp; message.subject &amp;&amp; message.message_type != 'notification'" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p>
+                <p t-if="options.display_subject &amp;&amp; message.display_subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p>
                 <t t-if="!(message.tracking_value_ids &amp;&amp; message.tracking_value_ids.length &gt; 0)">
                     <t t-if="message.body_short">
                         <div class="o_mail_body_short">
-- 
cgit v1.2.3