pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: yellow bubble when there's a mention of self

Browse Source 
closes odoo/odoo#123029

X-original-commit: c3f68f3a1d9b0245586bc7f6acece3b9a98bbf91
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
This commit is contained in:
Alexandre Kühn
2023-05-31 13:08:32 +02:00
parent 8762d7c535
commit 9c33452387
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/core_ui/message.js
-1
View File
@@ -147,7 +147,6 @@ export class Message extends Component {
get attClass() {
return {
"o-highlighted-from-mention": this.message.isHighlightedFromMention,
"o-highlighted bg-view shadow-lg": this.props.highlighted,
"o-selfAuthored": this.message.isSelfAuthored,
"o-selected": this.props.messageToReplyTo?.isSelected(
addons/mail/static/src/core_ui/message.xml
+3 -2
View File
@@ -83,8 +83,9 @@
<div class="position-relative">
<div class="o-mail-Message-bubble rounded-bottom-3 position-absolute top-0 start-0 w-100 h-100" t-att-class="{
'border': state.isEditing,
'bg-info-light border border-info opacity-25': !message.isSelfAuthored and !message.isNote,
'bg-success-light border border-success opacity-25': message.isSelfAuthored and !message.isNote,
'bg-info-light border border-info opacity-25': !message.isSelfAuthored and !message.isNote and !message.isHighlightedFromMention,
'bg-success-light border border-success opacity-25': message.isSelfAuthored and !message.isNote and !message.isHighlightedFromMention,
'bg-warning-light border border-warning opacity-50': message.isHighlightedFromMention,
}" t-attf-class="{{ isAlignedRight ? 'rounded-start-3' : 'rounded-end-3' }}"/>
<div class="position-relative" t-att-class="{
'p-1': message.isNote,
addons/mail/static/tests/message/message_tests.js
+2 -2
View File
@@ -961,7 +961,7 @@ QUnit.test(
});
const { openDiscuss } = await start();
await openDiscuss(channelId);
assert.hasClass($(".o-mail-Message"), "o-highlighted-from-mention");
assert.hasClass($(".o-mail-Message-bubble"), "bg-warning-light");
}
);
@@ -987,7 +987,7 @@ QUnit.test(
});
const { openDiscuss } = await start();
await openDiscuss(channelId);
assert.doesNotHaveClass($(".o-mail-Message"), "o-highlighted-from-mention");
assert.doesNotHaveClass($(".o-mail-Message-bubble"), "bg-warning-light");
}
);