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

Add python_2_unicode_compatible in models

Browse source
This commit is contained in:
Adam Dobrawy 2017-07-09 04:02:38 +02:00
parent 0471f6f4a2
commit 9f8d653ada
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
django_mailbox/models.py
View file

@ -28,6 +28,7 @@ from django.core.mail.message import make_msgid
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.encoding import python_2_unicode_compatible
from django_mailbox import utils from django_mailbox import utils
from django_mailbox.signals import message_received from django_mailbox.signals import message_received
@ -45,6 +46,7 @@ class ActiveMailboxManager(models.Manager):
) )
@python_2_unicode_compatible
class Mailbox(models.Model): class Mailbox(models.Model):
name = models.CharField( name = models.CharField(
_(u'Name'), _(u'Name'),
@ -418,7 +420,7 @@ class Mailbox(models.Model):
self.save() self.save()
return new_mail return new_mail
def __unicode__(self): def __str__(self):
return self.name return self.name
class Meta: class Meta:
@ -447,6 +449,7 @@ class UnreadMessageManager(models.Manager):
) )
@python_2_unicode_compatible
class Message(models.Model): class Message(models.Model):
mailbox = models.ForeignKey( mailbox = models.ForeignKey(
Mailbox, Mailbox,
@ -729,7 +732,7 @@ class Message(models.Model):
attachment.delete() attachment.delete()
return super(Message, self).delete(*args, **kwargs) return super(Message, self).delete(*args, **kwargs)
def __unicode__(self): def __str__(self):
return self.subject return self.subject
class Meta: class Meta:
@ -737,6 +740,7 @@ class Message(models.Model):
verbose_name_plural = _('E-mail messages') verbose_name_plural = _('E-mail messages')
@python_2_unicode_compatible
class MessageAttachment(models.Model): class MessageAttachment(models.Model):
message = models.ForeignKey( message = models.ForeignKey(
Message, Message,
@ -806,7 +810,7 @@ class MessageAttachment(models.Model):
raise KeyError('Header %s does not exist' % name) raise KeyError('Header %s does not exist' % name)
return value return value
def __unicode__(self): def __str__(self):
return self.document.url return self.document.url
class Meta: class Meta: