From d9bb64f1e93fc81ced07263b9e387245e7680500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 7 Apr 2023 10:40:50 +0000
Subject: [PATCH] [FIX] mail: show email_from if message has no author
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#118038

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 addons/mail/static/src/core_ui/message.xml       |  4 ++--
 .../mail/static/tests/message/message_tests.js   | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/addons/mail/static/src/core_ui/message.xml b/addons/mail/static/src/core_ui/message.xml
index 1706f302253..91fe21fe670 100644
--- a/addons/mail/static/src/core_ui/message.xml
+++ b/addons/mail/static/src/core_ui/message.xml
@@ -46,8 +46,8 @@
                     </div>
                     <div class="w-100" t-att-class="{ 'flex-grow-1': message.composer }">
                         <div t-if="!props.squashed" class="o-mail-Message-header d-flex flex-wrap align-items-baseline">
-                            <span t-if="message.author and shouldDisplayAuthorName" class="o-mail-Message-author" t-att-class="{ 'cursor-pointer o_redirect': hasAuthorClickable }" t-att-title="authorText" t-on-click="ev => this.onClickAuthor(ev)">
-                                <strong class="me-1 text-truncate" t-esc="message.author.name"/>
+                            <span t-if="(message.author or message.email_from) and shouldDisplayAuthorName" class="o-mail-Message-author" t-att-class="{ 'cursor-pointer o_redirect': hasAuthorClickable }" t-att-title="authorText" t-on-click="ev => this.onClickAuthor(ev)">
+                                <strong class="me-1 text-truncate"><t t-if="message.author" t-esc="message.author.name"/><t t-else="" t-esc="message.email_from"/></strong>
                             </span>
                             <small t-if="!message.isTransient" class="o-mail-Message-date text-muted opacity-50" t-att-class="{ 'me-2': !isAlignedRight }" t-att-title="message.datetimeShort">
                                 <t t-if="shouldDisplayAuthorName">- </t>
diff --git a/addons/mail/static/tests/message/message_tests.js b/addons/mail/static/tests/message/message_tests.js
index f5c02047005..b786086a3c4 100644
--- a/addons/mail/static/tests/message/message_tests.js
+++ b/addons/mail/static/tests/message/message_tests.js
@@ -1453,3 +1453,19 @@ QUnit.test("Avatar of unknown author", async (assert) => {
         ".o-mail-Message-avatar[data-src*='mail/static/src/img/email_icon.png']"
     );
 });
+
+QUnit.test("Show email_from of message without author", async (assert) => {
+    const pyEnv = await startServer();
+    pyEnv["mail.message"].create({
+        author_id: null,
+        body: "<p>Want to know features and benefits of using the new software.</p>",
+        email_from: "md@oilcompany.fr",
+        message_type: "email",
+        subject: "Need Details",
+        model: "res.partner",
+        res_id: pyEnv.currentPartnerId,
+    });
+    const { openFormView } = await start();
+    await openFormView("res.partner", pyEnv.currentPartnerId);
+    assert.containsOnce($, ".o-mail-Message-header:contains(md@oilcompany.fr)");
+});