diff options
| author | Sébastien Theys <seb@odoo.com> | 2020-11-20 16:05:53 +0000 |
|---|---|---|
| committer | Sébastien Theys <seb@odoo.com> | 2020-11-20 16:06:54 +0000 |
| commit | 4e0e8a415ae2175cd68e514cff33b2bffeb99db7 (patch) | |
| tree | 0d2cab2a7d4bd72d38eddc47b356686419b907aa /addons | |
| parent | 884bebb0f549dc4385cec9542f74e0bba64ccb08 (diff) | |
[FIX] mail: avoid empty seen indicator
`MessageSeenIndicator` sub-component should not be rendered if the thread does
not support seen indicators.
The issue is manifesting because the otherwise empty indicator has a margin,
which is adding more space than expected before the following element.
closes odoo/odoo#62030
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/static/src/components/message/message.xml | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/components/message/message_tests.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/addons/mail/static/src/components/message/message.xml b/addons/mail/static/src/components/message/message.xml index 300130f6518..92ed8c85813 100644 --- a/addons/mail/static/src/components/message/message.xml +++ b/addons/mail/static/src/components/message/message.xml @@ -76,7 +76,7 @@ <div class="o_Message_date o_Message_headerDate" t-att-class="{ 'o-message-selected': props.isSelected }" t-att-title="datetime"> - <t t-esc="message.dateFromNow"/> </div> - <t t-if="message.isCurrentPartnerAuthor and threadView and threadView.thread"> + <t t-if="message.isCurrentPartnerAuthor and threadView and threadView.thread and threadView.thread.hasSeenIndicators"> <MessageSeenIndicator class="o_Message_seenIndicator" messageLocalId="message.localId" threadLocalId="threadView.thread.localId"/> </t> <t t-if="threadView and message.originThread and message.originThread !== threadView.thread"> diff --git a/addons/mail/static/src/components/message/message_tests.js b/addons/mail/static/src/components/message/message_tests.js index 168faa342e7..15c070ccde1 100644 --- a/addons/mail/static/src/components/message/message_tests.js +++ b/addons/mail/static/src/components/message/message_tests.js @@ -343,6 +343,7 @@ QUnit.test("'channel_fetch' notification received is correctly handled", async f display_name: "Demo User", }); const thread = this.env.models['mail.thread'].create({ + channel_type: 'chat', id: 11, members: [ [['link', currentPartner]], @@ -404,6 +405,7 @@ QUnit.test("'channel_seen' notification received is correctly handled", async fu display_name: "Demo User", }); const thread = this.env.models['mail.thread'].create({ + channel_type: 'chat', id: 11, members: [ [['link', currentPartner]], @@ -464,6 +466,7 @@ QUnit.test("'channel_fetch' notification then 'channel_seen' received are corre display_name: "Demo User", }); const thread = this.env.models['mail.thread'].create({ + channel_type: 'chat', id: 11, members: [ [['link', currentPartner]], @@ -541,6 +544,7 @@ QUnit.test('do not show messaging seen indicator if not authored by me', async f display_name: "Demo User" }); const thread = this.env.models['mail.thread'].create({ + channel_type: 'chat', id: 11, partnerSeenInfos: [['create', [ { @@ -589,6 +593,7 @@ QUnit.test('do not show messaging seen indicator if before last seen by all mess display_name: "Demo User", }); const thread = this.env.models['mail.thread'].create({ + channel_type: 'chat', id: 11, messageSeenIndicators: [['insert', { channelId: 11, @@ -656,6 +661,7 @@ QUnit.test('only show messaging seen indicator if authored by me, after last see display_name: "Demo User" }); const thread = this.env.models['mail.thread'].create({ + channel_type: 'chat', id: 11, partnerSeenInfos: [['create', [ { |