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

Merge pull request #12133 from nextchamp-saqib/email-account-signature-fix

Browse source 
feat: fetch email account signature in email dialog
This commit is contained in:
mergify[bot] 2021-01-25 07:11:41 +00:00 • committed by GitHub
commit b4b009326b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -672,10 +672,19 @@ frappe.views.CommunicationComposer = Class.extend({
}
},
setup_earlier_reply: function() {
get_default_outgoing_email_account_signature: function() {
return frappe.db.get_value('Email Account', { 'default_outgoing': 1, 'add_signature': 1 }, 'signature');
},
setup_earlier_reply: async function() {
let fields = this.dialog.fields_dict;
let signature = frappe.boot.user.email_signature || "";
if (!signature) {
const res = await this.get_default_outgoing_email_account_signature();
signature = res.message.signature;
}
if(!frappe.utils.is_html(signature)) {
signature = signature.replace(/\n/g, "<br>");
}
@ -756,4 +765,3 @@ frappe.views.CommunicationComposer = Class.extend({
return text.replace(/\n{3,}/g, '\n\n');
}
});