From c21d200285ebeb646b8e5be6ba233f96d9714c6f Mon Sep 17 00:00:00 2001
From: XavierDo <xdo@odoo.com>
Date: Mon, 7 Jan 2019 12:31:18 +0000
Subject: [IMP] mail: add ooo status in chats windows.

In a chat window with a single usert (dm_chat) the ooo status of the
other user is displayed on the top when set.

Task: 1856205
---
 addons/mail/static/src/xml/thread_window.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/addons/mail/static/src/xml/thread_window.xml b/addons/mail/static/src/xml/thread_window.xml
index 4164bc0abc9..4d175fcf2b8 100644
--- a/addons/mail/static/src/xml/thread_window.xml
+++ b/addons/mail/static/src/xml/thread_window.xml
@@ -6,6 +6,9 @@
     -->
     <t t-name="mail.ThreadWindow" t-extend="mail.AbstractThreadWindow">
         <t t-jquery=".o_thread_window_header" t-operation="after">
+            <div class="o_out_of_office" t-if="widget.getOutOfOfficeMessage() !== undefined">
+                <div class="o_out_of_office_text" t-esc="widget.getOutOfOfficeMessage()"/>
+            </div>
             <div t-if="!widget.hasThread()" class="o_thread_search_input">
                 <span> To: </span>
                 <input type="text" placeholder="User name"/>
-- 
cgit v1.2.3


From 086405344e7302d9f7b243ba0c30d55131aeb3fe Mon Sep 17 00:00:00 2001
From: XavierDo <xdo@odoo.com>
Date: Mon, 7 Jan 2019 10:56:19 +0000
Subject: [IMP] mail, hr_holidays: use leaves to compute im_status

When on leave, the im_status can be either leave_online or leave_offline.
This will allow to display a specific icon and a default message when the user
is not at the office.
The leave can have an out of office message. This message will be displayed
in the chat window instead of the user ooo message, and the end date of the leave will be displayed too.

Technical details.
Right now the im_status access leaves directly to know if a user is on leave or not.
An index has been added to optimise this request (thanks to rco).
A solution to optimise this would be to compute part of the information in a cron.

Task: 1856205
---
 addons/mail/static/src/xml/thread_window.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/addons/mail/static/src/xml/thread_window.xml b/addons/mail/static/src/xml/thread_window.xml
index 4d175fcf2b8..d519d0ebbec 100644
--- a/addons/mail/static/src/xml/thread_window.xml
+++ b/addons/mail/static/src/xml/thread_window.xml
@@ -6,8 +6,9 @@
     -->
     <t t-name="mail.ThreadWindow" t-extend="mail.AbstractThreadWindow">
         <t t-jquery=".o_thread_window_header" t-operation="after">
-            <div class="o_out_of_office" t-if="widget.getOutOfOfficeMessage() !== undefined">
-                <div class="o_out_of_office_text" t-esc="widget.getOutOfOfficeMessage()"/>
+            <div class="o_out_of_office" t-if="widget.getOutOfOfficeInfo() or widget.getOutOfOfficeMessage()">
+                <div class="o_out_of_office_info" t-if="widget.getOutOfOfficeInfo()" t-esc="widget.getOutOfOfficeInfo()"/>
+                <div class="o_out_of_office_text" t-if="widget.getOutOfOfficeMessage()" t-esc="widget.getOutOfOfficeMessage()"/>
             </div>
             <div t-if="!widget.hasThread()" class="o_thread_search_input">
                 <span> To: </span>
-- 
cgit v1.2.3


From 062f748efb51e267496cc35c844dc8f59c267204 Mon Sep 17 00:00:00 2001
From: XavierDo <xdo@odoo.com>
Date: Mon, 14 Jan 2019 14:51:20 +0000
Subject: [IMP] mail: add a Read More on out of office message

Task: 1856205
---
 addons/mail/static/src/xml/thread_window.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/addons/mail/static/src/xml/thread_window.xml b/addons/mail/static/src/xml/thread_window.xml
index d519d0ebbec..76a130d1ba2 100644
--- a/addons/mail/static/src/xml/thread_window.xml
+++ b/addons/mail/static/src/xml/thread_window.xml
@@ -8,7 +8,10 @@
         <t t-jquery=".o_thread_window_header" t-operation="after">
             <div class="o_out_of_office" t-if="widget.getOutOfOfficeInfo() or widget.getOutOfOfficeMessage()">
                 <div class="o_out_of_office_info" t-if="widget.getOutOfOfficeInfo()" t-esc="widget.getOutOfOfficeInfo()"/>
-                <div class="o_out_of_office_text" t-if="widget.getOutOfOfficeMessage()" t-esc="widget.getOutOfOfficeMessage()"/>
+                <div class="o_out_of_office_text o_text_wrap" t-if="widget.getOutOfOfficeMessage()">
+                    <t t-esc="widget.getOutOfOfficeMessage()"/>
+                    <a href="#" class="o_out_of_office_read_more_less_button">Read more</a>
+                </div>
             </div>
             <div t-if="!widget.hasThread()" class="o_thread_search_input">
                 <span> To: </span>
-- 
cgit v1.2.3