From 1c4d49330e7f9719e372040f0c8729d3cf3d09fa Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Thu, 22 Nov 2018 14:00:43 +0000
Subject: [PATCH] [FIX] mail: notif manager positions date + check

By default in the notification manager we see something like:

```
record name     {a second ago}
summary                      V
```

but if for example the record name is long or the summary empty, we can
have something like:

```
record name so very long {a s}
V
---
record name so very very lo...
                             V
```

This is because the record name was not allowed to grow, and the
positionning of the check mark based itself on the existence of the
summary container (.o_last_message_preview).

With this change the date a message was sent is shown in any case and
the check mark is on the right.

opw-1911654
closes #28960
---
 addons/mail/static/src/scss/discuss.scss |  2 +-
 addons/mail/static/src/xml/discuss.xml   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/addons/mail/static/src/scss/discuss.scss b/addons/mail/static/src/scss/discuss.scss
index 13c28e8602f..8d328b028bf 100644
--- a/addons/mail/static/src/scss/discuss.scss
+++ b/addons/mail/static/src/scss/discuss.scss
@@ -329,7 +329,7 @@
         .o_preview_title {
             display: flex;
             .o_preview_name {
-                flex: 0 0 auto;
+                flex: 0 1 auto;
                 @include o-text-overflow;
             }
             .o_mail_activity_action_buttons {
diff --git a/addons/mail/static/src/xml/discuss.xml b/addons/mail/static/src/xml/discuss.xml
index 9d97de471ce..605dcb53956 100644
--- a/addons/mail/static/src/xml/discuss.xml
+++ b/addons/mail/static/src/xml/discuss.xml
@@ -287,14 +287,16 @@
                     </span>
                     <span class="o_last_message_date"> <t t-esc="preview.date ? preview.date.fromNow() : ''"/> </span>
                 </div>
-                <div t-if="preview.body" class="o_last_message_preview">
-                    <t t-if="preview.isMyselfAuthor">
-                        <span class="fa fa-mail-reply" role="img" aria-label="Reply"/> You:
+                <div class="o_last_message_preview">
+                    <t t-if="preview.body">
+                        <t t-if="preview.isMyselfAuthor">
+                            <span class="fa fa-mail-reply" role="img" aria-label="Reply"/> You:
+                        </t>
+                        <t t-elif="preview.author">
+                            <t t-esc="preview.author"/>:
+                        </t>
+                        <t t-raw="preview.body"/>
                     </t>
-                    <t t-elif="preview.author">
-                        <t t-esc="preview.author"/>:
-                    </t>
-                    <t t-raw="preview.body"/>
                 </div>
                 <span title="Mark as Read" class="o_discuss_icon o_mail_preview_mark_as_read fa fa-check" t-if="preview.unreadCounter"/>
             </div>