pacnpal/django-anymail
1
0
Fork 0
mirror of https://github.com/pacnpal/django-anymail.git synced 2025-12-20 11:51:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'send-template' of git://github.com/peillis/Djrill into send_template

Browse Source
This commit is contained in:
medmunds
2013-01-09 12:39:18 -08:00
parent b95d51a7f8 046987a934
commit 3b237a59db
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
djrill/mail/backends/djrill.py
View File

@@ -48,6 +48,7 @@ class DjrillBackend(BaseEmailBackend):
"in the settings.py file.")
self.api_action = self.api_url + "/messages/send.json"
self.template_api_action = self.api_url + "/messages/send-template.json"
def send_messages(self, email_messages):
if not email_messages:
@@ -77,10 +78,23 @@ class DjrillBackend(BaseEmailBackend):
raise
return False
djrill_it = requests.post(self.api_action, data=json.dumps({
"key": self.api_key,
"message": msg_dict
}))
# check if template is set in message to send it via
# api url: /messages/send-template.json
if hasattr(message, 'template_name'):
template_content = getattr(message, 'template_content',
None)
djrill_it = requests.post(self.template_api_action,
data=json.dumps({
"key": self.api_key,
"template_name": message.template_name,
"template_content": template_content,
"message": msg_dict
}))
else:
djrill_it = requests.post(self.api_action, data=json.dumps({
"key": self.api_key,
"message": msg_dict
}))
if djrill_it.status_code != 200:
if not self.fail_silently: