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

fix: added backend signature again

Browse source
This commit is contained in:
pateljannat 2021-03-19 10:57:43 +05:30
parent ca64d50dd4
commit 43c3f76ff6
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/email/email_body.py
View file

@ -252,12 +252,17 @@ def get_formatted_html(subject, message, footer=None, print_html=None,
if not email_account:
email_account = get_outgoing_email_account(False, sender=sender)
signature = None
if "<!-- signature-included -->" not in message:
signature = get_signature(email_account)
rendered_email = frappe.get_template("templates/emails/standard.html").render({
"brand_logo": get_brand_logo(email_account) if with_container or header else None,
"with_container": with_container,
"site_url": get_url(),
"header": get_header(header),
"content": message,
"signature": signature,
"footer": get_footer(email_account, footer),
"title": subject,
"print_html": print_html,

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

@ -718,7 +718,7 @@ frappe.views.CommunicationComposer = Class.extend({
if (!signature) {
const res = await this.get_default_outgoing_email_account_signature();
signature = res.message.signature;
signature = "<!-- signature-included -->" + res.message.signature;
}
if (signature && !frappe.utils.is_html(signature)) {