mirror of
https://github.com/pacnpal/django-anymail.git
synced 2025-12-20 03:41:05 -05:00
Merge branch 'master' of https://github.com/brack3t/Djrill into travis_ci
This commit is contained in:
@@ -8,7 +8,7 @@ class DjrillMessage(EmailMultiAlternatives):
|
||||
def __init__(self, subject='', body='', from_email=None, to=None, bcc=None,
|
||||
connection=None, attachments=None, headers=None, alternatives=None,
|
||||
cc=None, from_name=None, tags=None, track_opens=True,
|
||||
track_clicks=True):
|
||||
track_clicks=True, preserve_recipients=False):
|
||||
|
||||
super(DjrillMessage, self).__init__(subject, body, from_email, to, bcc,
|
||||
connection, attachments, headers, alternatives, cc)
|
||||
@@ -17,6 +17,7 @@ class DjrillMessage(EmailMultiAlternatives):
|
||||
self.tags = self._set_mandrill_tags(tags)
|
||||
self.track_opens = track_opens
|
||||
self.track_clicks = track_clicks
|
||||
self.preserve_recipients = preserve_recipients
|
||||
|
||||
def _set_mandrill_tags(self, tags):
|
||||
"""
|
||||
|
||||
@@ -128,7 +128,8 @@ class DjrillBackend(BaseEmailBackend):
|
||||
self.msg_dict.update({
|
||||
"tags": message.tags,
|
||||
"track_opens": message.track_opens,
|
||||
"track_clicks": message.track_clicks
|
||||
"track_clicks": message.track_clicks,
|
||||
"preserve_recipients": message.preserve_recipients,
|
||||
})
|
||||
if message.from_name:
|
||||
self.msg_dict["from_name"] = message.from_name
|
||||
|
||||
2
setup.py
2
setup.py
@@ -2,7 +2,7 @@ from setuptools import setup
|
||||
|
||||
setup(
|
||||
name="djrill",
|
||||
version="0.1.2",
|
||||
version="0.1.4.1",
|
||||
description='Django email backend for Mandrill.',
|
||||
long_description='Email backend and new message class to send emails through the Mandrill email service.',
|
||||
keywords="django, mailchimp, mandrill, email, email backend",
|
||||
|
||||
Reference in New Issue
Block a user