added bulk option in frappe.sendmail and header extension

hace 11 años · a060b2b4a2
--- a/frappe/init.py
+++ b/frappe/init.py
@@ -215,12 +215,20 @@ def set_user(username):
 def get_request_header(key, default=None):
 	return request.headers.get(key, default)

 def sendmail(recipients=(), sender="", subject="No Subject", message="No Message", as_markdown=False):
 	import frappe.utils.email_lib
 	if as_markdown:
 		frappe.utils.email_lib.sendmail_md(recipients, sender=sender, subject=subject, msg=message)
 def sendmail(recipients=(), sender="", subject="No Subject", message="No Message",
 		as_markdown=False, bulk=False):

 	if bulk:
 		import frappe.utils.email_lib.bulk
 		frappe.utils.email_lib.bulk.send(recipients=recipients, sender=sender,
 			subject=subject, message=msg, add_unsubscribe_link=False)

 	else:
 		frappe.utils.email_lib.sendmail(recipients, sender=sender, subject=subject, msg=message)
 		import frappe.utils.email_lib
 		if as_markdown:
 			frappe.utils.email_lib.sendmail_md(recipients, sender=sender, subject=subject, msg=message)
 		else:
 			frappe.utils.email_lib.sendmail(recipients, sender=sender, subject=subject, msg=message)

 logger = None
 whitelisted = []
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -20,10 +20,6 @@ https://frappe.io/apps/frappe
 		<meta name="{{ name }}" content="{{ metatags[name]|striptags }}">
 		{%- endfor -%}
 		{%- endif -%}
 		{%- for link in web_include_js %}
 		<script type="text/javascript" src="{{ link }}"></script>
 		{%- endfor -%}

 		{%- for link in web_include_css %}
 		<link type="text/css" rel="stylesheet" href="{{ link }}">
 		{%- endfor -%}
@@ -38,6 +34,7 @@ https://frappe.io/apps/frappe
 <body>
 	<div id="wrap">
 		{%- block banner -%}
 		{% include "templates/includes/banner_extension.html" %}
 			{% if banner_html -%}
 			<header class="container">{{ banner_html or "" }}</header>
 			{%- endif %}
@@ -92,6 +89,10 @@ https://frappe.io/apps/frappe
 		{%- block footer -%}{% include "templates/includes/footer.html" %}{%- endblock -%}
 	</div>

 	{%- for link in web_include_js %}
 	<script type="text/javascript" src="{{ link }}"></script>
 	{%- endfor -%}

 	{%- block script %}
 		<script data-html-block="script">
 		{%- if script is defined -%}{{ script }}{%- endif -%}