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

fix(email): Dont append last email in the next reply (#6471)

Browse source 
In large threads, this leads to snowballing of replies, sometime even
reaching more than 5 million characters.
Email threads are already maintained in ERPNext, and modern clients
are capable of maintaining threads.
The only purpose it serves is maintain threads for text based email
client, and I think we should ignore that use case, for improved user
experience for Frappe/ERPNext users.
This commit is contained in:
Faris Ansari 2018-11-26 17:25:09 +01:00 • committed by Suraj Shetty
parent e49ee43b73
commit 0e1107b982
1 changed files with 5 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -614,19 +614,14 @@ frappe.views.CommunicationComposer = Class.extend({
},
setup_earlier_reply: function() {
var fields = this.dialog.fields_dict,
signature = frappe.boot.user.email_signature || "",
last_email = this.last_email;
if(!last_email) {
last_email = this.frm && this.frm.timeline.get_last_email(true);
}
let fields = this.dialog.fields_dict;
let signature = frappe.boot.user.email_signature || "";
if(!frappe.utils.is_html(signature)) {
signature = signature.replace(/\n/g, "<br>");
}
if(this.txt) {
if (this.txt) {
this.message = this.txt + (this.message ? ("<br><br>" + this.message) : "");
} else {
// saved draft in localStorage
@ -641,29 +636,8 @@ frappe.views.CommunicationComposer = Class.extend({
+ this.real_name + ",</p><!-- salutation-ends --><br>" + (this.message || "");
}
var reply = (this.message || "")
+ (signature ? ("<br>" + signature) : "");
var content = '';
var reply = (this.message || "") + (signature ? ("<br>" + signature) : "");
if(last_email) {
var last_email_content = last_email.original_comment || last_email.content;
last_email_content = last_email_content
.replace(/&lt;meta[\s\S]*meta&gt;/g, '') // remove <meta> tags
.replace(/&lt;style[\s\S]*&lt;\/style&gt;/g, ''); // // remove <style> tags
var communication_date = last_email.communication_date || last_email.creation;
content = '<div><br></div>'
+ reply
+ "<div data-comment='original-reply'></div>"
+ '<blockquote>' +
'<p>' + __("On {0}, {1} wrote:",
[frappe.datetime.global_date_format(communication_date) , last_email.sender]) + '</p>' +
last_email_content +
'<blockquote>';
} else {
content = "<div><br></div>" + reply;
}
fields.content.set_value(content);
fields.content.set_value(reply);
}
});