From 642cec94c46ce309b40a6c1d1470cbc4fb121f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20K=C3=BChn?= Date: Tue, 15 Mar 2022 14:21:59 +0000 Subject: [PATCH] [IMP] mail: turn 'Message/shorttime' into field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-2793280 closes odoo/odoo#86459 Signed-off-by: Alexandre Kühn (aku) --- .../mail/static/src/components/message/message.js | 9 --------- .../mail/static/src/components/message/message.xml | 2 +- addons/mail/static/src/models/message.js | 13 +++++++++++++ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/addons/mail/static/src/components/message/message.js b/addons/mail/static/src/components/message/message.js index a052d10aac5..f5e97322185 100644 --- a/addons/mail/static/src/components/message/message.js +++ b/addons/mail/static/src/components/message/message.js @@ -230,15 +230,6 @@ export class Message extends Component { } } - /** - * Get the shorttime format of the message date. - * - * @returns {string} - */ - get shortTime() { - return this.messageView.message.date.format('hh:mm'); - } - //-------------------------------------------------------------------------- // Private //-------------------------------------------------------------------------- diff --git a/addons/mail/static/src/components/message/message.xml b/addons/mail/static/src/components/message/message.xml index 245490939af..b50bb7d5655 100644 --- a/addons/mail/static/src/components/message/message.xml +++ b/addons/mail/static/src/components/message/message.xml @@ -46,7 +46,7 @@
- +
diff --git a/addons/mail/static/src/models/message.js b/addons/mail/static/src/models/message.js index 5db2d464a02..d83270485ab 100644 --- a/addons/mail/static/src/models/message.js +++ b/addons/mail/static/src/models/message.js @@ -555,6 +555,16 @@ registerModel({ // add anchor tags to urls return parseAndTransform(prettyBody, addLink); }, + /** + * @private + * @returns {string|FieldCommand} + */ + _computeShortTime() { + if (!this.date) { + return clear(); + } + return this.date.format('hh:mm'); + }, /** * @private * @returns {Thread[]} @@ -878,6 +888,9 @@ registerModel({ default: "", }), recipients: many('Partner'), + shortTime: attr({ + compute: '_computeShortTime', + }), subject: attr(), subtype_description: attr(), subtype_id: attr(),