From 7137891a8a5d024a7f36a5af1d3a3c2686a9a96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Thu, 26 Nov 2015 10:48:29 +0100
Subject: [FIX] mail, im_livechat: correctly displayed message date

Messages are required to be displayed in a smarter way: relative to the
current date, if it's a recent message, or absolute if not.  This
commits rework most of the date processing code to comply with these
requirements.

Messages were preprocessed each time a thread is rendered, which is
stupid.  It should be preprocessed only when the message is created.
This was a small problem because livechat does not use the chat manager,
so a simplified version of the preprocessing had to be done.
---
 addons/mail/static/src/xml/thread.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index 394627940cb..70996dd7d47 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -30,11 +30,11 @@
         <t t-if="options.messages_separator_position == 'top'" t-call="mail.MessagesSeparator"/>
         <t t-set="current_day" t-value="0"/>
         <t t-foreach="messages" t-as="message">
-            <div t-if="current_day != message.date.split(' ')[0]" class="o_thread_date_separator">
+            <div t-if="current_day != message.day" class="o_thread_date_separator">
                 <span class="o_thread_date">
-                    <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LL')"/>
+                    <t t-esc="message.day"/>
                 </span>
-                <t t-set="current_day" t-value="message.date.split(' ')[0]"/>
+                <t t-set="current_day" t-value="message.day"/>
             </div>
 
             <t t-call="mail.ChatThread.Message"/>
@@ -56,8 +56,8 @@
                         t-att-src="message.avatar_src"
                         class="o_thread_message_avatar"/>
                 </t>
-                <span t-if="!message.display_author" t-att-title="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LLL')" class="o_thread_message_side_date">
-                    <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('hh:mm')"/>
+                <span t-if="!message.display_author" t-att-title="message.date" class="o_thread_message_side_date">
+                    <t t-esc="message.date.format('hh:mm')"/>
                 </span>
                 <i t-if="!message.display_author &amp;&amp; options.display_stars &amp;&amp; message.message_type != 'notification'"
                     t-att-class="'fa o_thread_message_star ' + (message.is_starred ? 'fa-star' : 'fa-star-o')"
@@ -83,8 +83,8 @@
                         <t t-esc="message.displayed_author"/>
                     </strong>
 
-                    <small t-att-title="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('LLL')">
-                        - <t t-esc="moment(message.date, 'YYYY-MM-DD hh:mm:ss').format('hh:mm A')"/>
+                    <small t-att-title="message.date">
+                        - <t t-esc="message.hour"/>
                     </small>
                     <t t-if="message.model &amp;&amp; (message.model != 'mail.channel') &amp;&amp; options.display_document_link">
                         on <a class="o_mail_redirect" href="#" t-att-data-oe-model="message.model" t-att-data-oe-id="message.res_id"><t t-esc="message.record_name"/></a>
-- 
cgit v1.2.3


From 2c84cd4181f8601ec21ffd9b7edb4013c141beb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= <ged@odoo.com>
Date: Thu, 26 Nov 2015 14:57:16 +0100
Subject: [FIX] mail: various improvements/fixes

- display appropriate message when no results are found in a search
- don't display 'you have been invited' notif when creating private channel
- correctly join when a user was invited in a public channel
- display a message when a user join a channel through an invitation
- don't display subject for message of type notification (still a
  mystery why it happens in test.odoo.com for channel of type mailing)
- better heuristic on when to display message subject
- tweak sidebar text color (slightly whiter)
- add ... to the placeholder of the text area in the composer
- invert send and icons for attach/smiley in composer
- don't display 'read less' on expanded messages
- exclude livechat channels from channel mention suggestions
---
 addons/mail/static/src/xml/thread.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/addons/mail/static/src/xml/thread.xml b/addons/mail/static/src/xml/thread.xml
index 70996dd7d47..ebf6687c1a3 100644
--- a/addons/mail/static/src/xml/thread.xml
+++ b/addons/mail/static/src/xml/thread.xml
@@ -9,9 +9,13 @@
             <t t-if="options.display_load_more &amp;&amp; options.display_order == ORDER.DESC"
                t-call="mail.ChatThread.LoadMore"/>
         </t>
-        <t t-if="!messages.length &amp;&amp; options.display_help">
+        <t t-if="options.display_empty_channel">
             <t t-call="mail.EmptyChannel" />
         </t>
+        <t t-if="options.display_no_match">
+            <div class="o_thread_title">No matches found</div>
+            <div>No message matches your search. Try to change your search filters.</div>
+        </t>
     </t>
 
     <!-- When a channel is empty-->
@@ -107,7 +111,7 @@
                     </t>
                     <t t-call="mail.ChatThread.MessageTracking"/>
                 </t>
-                <p t-if="message.subject" class="o_mail_subject">Subject: <t t-esc="message.subject"/></p>
+                <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>
                 <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">
@@ -115,7 +119,6 @@
                         </div>
                         <div class="o_mail_body_long">
                             <t t-raw="message.body"/>
-                            <span class="oe_mail_expand"><a href="#">... read less</a></span>
                         </div>
                     </t>
                     <t t-if="! message.body_short">
-- 
cgit v1.2.3