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 'feature/use-mandrill-template-defaults' of git://github.com/nikolay-saskovets/Djrill into nikolay-saskovets-feature/use-mandrill-template-defaults

Browse Source
This commit is contained in:
medmunds
2014-05-28 20:42:36 -07:00
parent 66ae927b4c 3eb4582449
commit 78ff0af229
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,7 @@ 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
@@ -313,3 +314,11 @@ 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'] = ''