mirror/django-mailbox
1
0
Fork 1
mirror of https://github.com/coddingtonbear/django-mailbox.git synced 2026-07-10 06:48:19 +02:00
Code Activity

Merge 98cbce5f6c into ce6ce6b5dd

Browse source
This commit is contained in:
Tonis Piip 2017-03-18 12:23:38 +00:00 • committed by GitHub
commit b504c10c0e
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
django_mailbox/models.py
View file

@ -34,6 +34,8 @@ from django_mailbox.transports import Pop3Transport, ImapTransport, \
MaildirTransport, MboxTransport, BabylTransport, MHTransport, \ MaildirTransport, MboxTransport, BabylTransport, MHTransport, \
MMDFTransport, GmailImapTransport MMDFTransport, GmailImapTransport
from lino.core.fields import NullCharField
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -64,8 +66,8 @@ class Mailbox(models.Model):
"contain illegal characters (like @, :, etc)." "contain illegal characters (like @, :, etc)."
)), )),
blank=True, blank=True,
null=True, # null=True,
default=None, default="",
) )
from_email = models.CharField( from_email = models.CharField(
@ -81,8 +83,8 @@ class Mailbox(models.Model):
"be set to match the setting `DEFAULT_FROM_EMAIL`." "be set to match the setting `DEFAULT_FROM_EMAIL`."
)), )),
blank=True, blank=True,
null=True, # null=True,
default=None, default="",
) )
active = models.BooleanField( active = models.BooleanField(
@ -419,6 +421,11 @@ class UnreadMessageManager(models.Manager):
class Message(models.Model): class Message(models.Model):
class Meta:
verbose_name = _("Message")
verbose_name_plural = _("Messages")
mailbox = models.ForeignKey( mailbox = models.ForeignKey(
Mailbox, Mailbox,
related_name='messages', related_name='messages',
@ -470,7 +477,7 @@ class Message(models.Model):
processed = models.DateTimeField( processed = models.DateTimeField(
_('Processed'), _('Processed'),
auto_now_add=True default=now
) )
read = models.DateTimeField( read = models.DateTimeField(
@ -483,6 +490,7 @@ class Message(models.Model):
eml = models.FileField( eml = models.FileField(
_(u'Raw message contents'), _(u'Raw message contents'),
null=True, null=True,
blank=True,
upload_to="messages", upload_to="messages",
help_text=_(u'Original full content of message') help_text=_(u'Original full content of message')
) )

2
django_mailbox/tests/test_process_email.py
View file

@ -382,7 +382,7 @@ class TestProcessEmail(EmailMessageTestCase):
self.assertEqual(actual_from, msg.from_header) self.assertEqual(actual_from, msg.from_header)
reply_email_object.from_email = None reply_email_object.from_email = ""
with mock.patch.object(reply_email_object, 'send'): with mock.patch.object(reply_email_object, 'send'):
second_reply_msg = msg.reply(reply_email_object) second_reply_msg = msg.reply(reply_email_object)