entrouvert
/
passerelle-montpellier-encombrants
17
0
Fork 0
Code Issues Pull Requests Releases Activity

use python_2_unicode_compatible for objects representation (#39560)

This commit is contained in:
Emmanuel Cazenave 2020-02-05 13:37:45 +01:00
parent 643ebb3df7
commit 5bf620f918
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
passerelle_montpellier_encombrants/models.py
View File

@ -16,6 +16,7 @@
from django.core.urlresolvers import reverse
from django.db import models
from django.utils import six
from django.utils.translation import ugettext_lazy as _
from passerelle.base.models import BaseResource
@ -42,6 +43,7 @@ class EncombrantsManagement(BaseResource):
return reverse('montpellier-encombrants-add')
@six.python_2_unicode_compatible
class Sector(models.Model):
contact_email = models.CharField(max_length=1024, blank=True,
verbose_name=_('Contact Emails'),
@ -50,13 +52,14 @@ class Sector(models.Model):
class Meta:
verbose_name = _('Sector')
def __unicode__(self):
def __str__(self):
communes = Commune.objects.filter(sector=self)
if not communes:
return '(%s)' % self.id
return ', '.join([x.name for x in communes])
@six.python_2_unicode_compatible
class Commune(models.Model):
name = models.CharField(max_length=50, blank=False,
verbose_name=_('Name'))
@ -64,19 +67,21 @@ class Commune(models.Model):
verbose_name=_('INSEE Code'))
sector = models.ForeignKey(Sector, verbose_name=_('Sector'))
def __unicode__(self):
def __str__(self):
return u'%s (%s)' % (self.name, self.insee)
@six.python_2_unicode_compatible
class Street(models.Model):
commune = models.ForeignKey(Commune)
name = models.CharField(max_length=128, blank=False,
verbose_name=_('Street'))
def __unicode__(self):
def __str__(self):
return '%s, %s' % (self.name, self.commune)
@six.python_2_unicode_compatible
class CollectDay(models.Model):
sector = models.ForeignKey(Sector,
verbose_name=_('Sector'))
@ -86,5 +91,5 @@ class CollectDay(models.Model):
ordering = ['date']
unique_together = ('sector', 'date')
def __unicode__(self):
def __str__(self):
return '%s: %s' % (self.date, self.sector)