Skip to content

[FIX] mail: message '(edited)' inline to content #204148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[FIX] mail: message '(edited)' inline to content #204148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions addons/mail/static/src/core/common/message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ export class Message extends Component {
this.message.translationValue,
this.props.messageSearch?.searchTerm,
this.message.body,
this.message.composer,
]
);
}
Expand Down Expand Up @@ -409,6 +410,8 @@ export class Message extends Component {
if (!bodyEl) {
return;
}
const editedEl = bodyEl.querySelector(".o-mail-Message-edited");
editedEl?.replaceChildren(renderToElement("mail.Message.edited"));
const linkEls = bodyEl.querySelectorAll(".o_channel_redirect");
for (const linkEl of linkEls) {
const text = linkEl.textContent.substring(1); // remove '#' prefix
Expand Down
4 changes: 0 additions & 4 deletions addons/mail/static/src/core/common/message.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
opacity: 50%;
}

.o-mail-Message-edited {
display: none;
}

.o-mail-Message-seenContainer {
font-size: 0.65rem;
right: 2px;
Expand Down
5 changes: 4 additions & 1 deletion addons/mail/static/src/core/common/message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
<div class="overflow-x-auto" t-if="message.message_type and message.message_type.includes('email')" t-ref="shadowBody"/>
<t t-elif="state.showTranslation" t-out="message.translationValue"/>
<t t-elif="message.body" t-out="props.messageSearch?.highlight(message.body) ?? message.body"/>
<em t-if="message.edited" class="smaller fw-bold text-500"> (edited)</em>
<p class="fst-italic text-muted small" t-if="state.showTranslation">
<t t-if="message.translationSource" t-esc="translatedFromText"/>
</p>
Expand Down Expand Up @@ -130,6 +129,10 @@
</ActionSwiper>
</t>

<t t-name="mail.Message.edited">
<em class="smaller fw-bold text-500"> (edited)</em>
</t>

<t t-name="mail.Message.actions">
<div t-if="props.hasActions and message.hasActions and !state.isEditing" class="o-mail-Message-actions d-print-none"
t-att-class="{
Expand Down
5 changes: 5 additions & 0 deletions addons/mail/static/tests/message/message.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ test("Can edit message comment in chatter", async () => {
await insertText(".o-mail-Message .o-mail-Composer-input", "edited message", { replace: true });
await click(".o-mail-Message a", { text: "save" });
await contains(".o-mail-Message-content", { text: "edited message (edited)" });
// save without change should keep (edited)
await click(".o-mail-Message [title='Expand']");
await click(".o-mail-Message-moreMenu [title='Edit']");
await click(".o-mail-Message a", { text: "save" });
await contains(".o-mail-Message-content", { text: "edited message (edited)" });
});

test("Can edit message comment in chatter (mobile)", async () => {
Expand Down