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

added bulk option in frappe.sendmail and header extension

Browse source
This commit is contained in:
Rushabh Mehta 2014-05-09 10:50:05 +05:30
parent 407c5eb092
commit a060b2b4a2
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frappe/__init__.py
View file

@ -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 = []

9
frappe/templates/base.html
View file

@ -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 -%}