summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/components/message/message.xml
diff options
context:
space:
mode:
authorXavier Dubuc <xdu@odoo.com>2020-07-08 11:26:14 +0000
committerXavier Dubuc <xdu@odoo.com>2020-07-22 11:12:35 +0000
commitc43cdd3f192138d2eb74b2035798386ad901d27f (patch)
tree3488c54bdb5175f16af5bbed7eed8154bcf62825 /addons/mail/static/src/components/message/message.xml
parent1c2bc40a95cdedd7dcd0ad2f047887ff7278c038 (diff)
[IMP] mail: hide message error notifications if not origin thread
task-2282370 closes odoo/odoo#54768 X-original-commit: 4f693105bcaac7546590302cdc25c2b11b0f42cd Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Diffstat (limited to 'addons/mail/static/src/components/message/message.xml')
-rw-r--r--addons/mail/static/src/components/message/message.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/components/message/message.xml b/addons/mail/static/src/components/message/message.xml
index fecc16d4be4..51689f70449 100644
--- a/addons/mail/static/src/components/message/message.xml
+++ b/addons/mail/static/src/components/message/message.xml
@@ -78,7 +78,7 @@
<t t-if="message.isCurrentPartnerAuthor and threadViewer and threadViewer.thread">
<MessageSeenIndicator class="o_Message_seenIndicator" messageLocalId="message.localId" threadLocalId="threadViewer.thread.localId"/>
</t>
- <t t-if="hasDifferentOriginThread">
+ <t t-if="threadViewer and message.originThread and message.originThread !== threadViewer.thread">
<div class="o_Message_originThread" t-att-class="{ 'o-message-selected': props.isSelected }">
<t t-if="message.originThread.model === 'mail.channel'">
(from <a class="o_Message_originThreadLink" href="#" t-on-click="_onClickOriginThread">#<t t-esc="message.originThread.name"/></a>)
@@ -91,7 +91,7 @@
<t t-if="message.moderation_status === 'pending_moderation' and !message.isModeratedByCurrentPartner">
<span class="o_Message_moderationPending o-author" title="Your message is pending moderation.">Pending moderation</span>
</t>
- <t t-if="message.notifications.length > 0">
+ <t t-if="threadViewer and message.originThread and message.originThread === threadViewer.thread and message.notifications.length > 0">
<t t-if="message.failureNotifications.length > 0">
<span class="o_Message_notificationIconContainer o-error" t-on-click="_onClickFailure">
<i name="failureIcon" class="o_Message_notificationIcon fa fa-envelope"/>