vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: duplicate last quoted messagg (#37240)

Browse source
This commit is contained in:
Sumit Jain 2026-02-23 14:36:33 +05:30 • committed by GitHub
parent b7214c6957
commit 29bbb183a1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frappe/public/js/frappe/views/communication.js
View file

@ -5,6 +5,8 @@ import localforage from "localforage";
frappe.last_edited_communication = {};
const separator_element = "<div>---</div>";
// Quill uses <p>---</p>; match both when stripping quoted content
const separator_regex = /<(?:div|p)(?:\s[^>]*)?>---<\/(?:div|p)>/i;
frappe.views.CommunicationComposer = class {
constructor(opts) {
@ -566,6 +568,18 @@ frappe.views.CommunicationComposer = class {
const last_edited = this.get_last_edited_communication();
if (!last_edited.content && !last_edited.html_content) return;
// For replies: strip duplicate quoted content (Quill uses <p>---</p>)
if (this.is_a_reply) {
const reply_block = this.get_earlier_reply();
for (const field of ["content", "html_content"]) {
if (last_edited[field]) {
last_edited[field] =
(last_edited[field].split(separator_regex)[0] || "").trimEnd() +
reply_block;
}
}
}
// prevent re-triggering of email template
if (last_edited.email_template) {
const template_field = this.dialog.fields_dict.email_template;
@ -789,7 +803,7 @@ frappe.views.CommunicationComposer = class {
save_as_draft() {
if (this.dialog && this.frm) {
let message = this.get_email_content();
message = message.split(separator_element)[0];
message = message.split(separator_regex)[0];
this.save_item_in_local_forage(this.frm.doctype + this.frm.docname, message);
this.save_item_in_local_forage(
this.frm.doctype + this.frm.docname + "_use_html",
@ -950,7 +964,7 @@ frappe.views.CommunicationComposer = class {
}
if (this.is_a_reply && !this.reply_set) {
message += this.get_earlier_reply();
message = message.split(separator_regex)[0] + this.get_earlier_reply();
}
await this.set_email_content(message);