paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 09:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make mandrill actions better

Browse Source 
clear_followup_emails_queue now filters by from_email too
send_local_email_template_with_delay passes the template_payload into the subject template

(imported from commit 8044fe2ebad90a9d6d5c67cdfdd08801760fd7f7)
This commit is contained in:
acrefoot
2013-10-16 17:24:08 -04:00
parent 03c856ce10
commit 776feb84e9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/actions.py
View File

@@ -2040,6 +2040,8 @@ def clear_followup_emails_queue(email, from_email=None, mail_client=None):
to send the email (for example `support@zulip.com` or `signups@zulip.com`) to send the email (for example `support@zulip.com` or `signups@zulip.com`)
""" """
for email in mail_client.messages.list_scheduled(to=email): for email in mail_client.messages.list_scheduled(to=email):
if from_email is not None and email.get('from_email') != from_email:
continue
result = mail_client.messages.cancel_scheduled(id=email["_id"]) result = mail_client.messages.cancel_scheduled(id=email["_id"])
if result.get("status") == "error": if result.get("status") == "error":
print result.get("name"), result.get("error") print result.get("name"), result.get("error")
@@ -2090,7 +2092,7 @@ def send_local_email_template_with_delay(recipients, template_prefix,
tags=[], sender={'email': 'noreply@zulip.com', 'name': 'Zulip'}): tags=[], sender={'email': 'noreply@zulip.com', 'name': 'Zulip'}):
html_content = loader.render_to_string(template_prefix + ".html", template_payload) html_content = loader.render_to_string(template_prefix + ".html", template_payload)
text_content = loader.render_to_string(template_prefix + ".text", template_payload) text_content = loader.render_to_string(template_prefix + ".text", template_payload)
subject = loader.render_to_string(template_prefix + ".subject").strip() subject = loader.render_to_string(template_prefix + ".subject", template_payload).strip()
return send_future_email(recipients, return send_future_email(recipients,
html_content, html_content,