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

use_template_subject and use_template_from

Browse Source 
Change "clear_subject" and "clear_from" to clarify expected usage.
Update docs.
Acknowledge contribution.
This commit is contained in:
medmunds
2014-05-28 21:09:28 -07:00
parent 78ff0af229
commit 780d4f98f7
4 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,6 @@ class DjrillBackend(BaseEmailBackend):
if getattr(message, 'alternatives', None):
self._add_alternatives(message, msg_dict)
self._add_attachments(message, msg_dict)
self._filter_msg_dict(message, msg_dict)
api_params['message'] = msg_dict
# check if template is set in message to send it via
@@ -145,12 +144,16 @@ class DjrillBackend(BaseEmailBackend):
content = "html" if message.content_subtype == "html" else "text"
msg_dict = {
content: message.body,
"subject": message.subject,
"from_email": from_email,
"to": to_list
}
if from_name:
msg_dict["from_name"] = from_name
if not getattr(message, 'use_template_from', False):
msg_dict["from_email"] = from_email
if from_name:
msg_dict["from_name"] = from_name
if not getattr(message, 'use_template_subject', False):
msg_dict["subject"] = message.subject
if message.extra_headers:
msg_dict["headers"] = message.extra_headers
@@ -314,11 +317,3 @@ class DjrillBackend(BaseEmailBackend):
'content': content_b64.decode('ascii'),
}
return mandrill_attachment, is_embedded_image
def _filter_msg_dict(self, message, msg_dict):
"""Filter message data (e.g. clear subject field, or from field)"""
if hasattr(message, 'clear_from') and message.clear_from:
msg_dict['from_name'] = ''
msg_dict['from_email'] = ''
if hasattr(message, 'clear_subject') and message.clear_subject:
msg_dict['subject'] = ''

19
djrill/tests/test_mandrill_send_template.py
View File

@@ -31,15 +31,24 @@ class DjrillMandrillSendTemplateTests(DjrillBackendMockAPITestCase):
msg = mail.EmailMessage('Subject', 'Text Body',
'from@example.com', ['to@example.com'])
msg.template_name = "PERSONALIZED_SPECIALS"
msg.clear_from = True
msg.clear_subject = True
msg.use_template_from = True
msg.send()
self.assert_mandrill_called("/messages/send-template.json")
data = self.get_api_call_data()
self.assertEqual(data['template_name'], "PERSONALIZED_SPECIALS")
self.assertEqual(data['message']['subject'], "")
self.assertEqual(data['message']['from_email'], "")
self.assertEqual(data['message']['from_name'], "")
self.assertFalse('from_email' in data['message'])
self.assertFalse('from_name' in data['message'])
def test_send_template_without_subject_field(self):
msg = mail.EmailMessage('Subject', 'Text Body',
'from@example.com', ['to@example.com'])
msg.template_name = "PERSONALIZED_SPECIALS"
msg.use_template_subject = True
msg.send()
self.assert_mandrill_called("/messages/send-template.json")
data = self.get_api_call_data()
self.assertEqual(data['template_name'], "PERSONALIZED_SPECIALS")
self.assertFalse('subject' in data['message'])
def test_no_template_content(self):
# Just a template, without any template_content to be merged