federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

During reply update from_email only if not set

Browse source
This commit is contained in:
Adam Dobrawy 2015-03-14 18:23:19 +01:00
parent 793f92cfcf
commit 24138d1dc7
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
django_mailbox/models.py
View file

@ -498,10 +498,11 @@ class Message(models.Model):
pre-set it. pre-set it.
""" """
if self.mailbox.from_email: if not getattr(message, 'from_email', None):
message.from_email = self.mailbox.from_email if self.mailbox.from_email:
else: message.from_email = self.mailbox.from_email
message.from_email = settings.DEFAULT_FROM_EMAIL else:
message.from_email = settings.DEFAULT_FROM_EMAIL
message.extra_headers['Message-ID'] = make_msgid() message.extra_headers['Message-ID'] = make_msgid()
message.extra_headers['Date'] = formatdate() message.extra_headers['Date'] = formatdate()
message.extra_headers['In-Reply-To'] = self.message_id message.extra_headers['In-Reply-To'] = self.message_id