diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-31 22:16:26 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-03-31 22:16:26 +0200 |
| commit | bf5c103108c4855e6d55334b44f2792148119c04 (patch) | |
| tree | 33aa7f6906a1906cd6012f8dfcf36d5e2c450060 | |
| parent | 4e6d2e4b742b23504a434c6e5289f579feeded78 (diff) | |
| download | Ishtar-bf5c103108c4855e6d55334b44f2792148119c04.tar.bz2 Ishtar-bf5c103108c4855e6d55334b44f2792148119c04.zip | |
Correct a bug in period presentation
| -rw-r--r-- | ishtar/furnitures/models.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 6b586decf..edaaf2dc1 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -558,7 +558,11 @@ class Dating(models.Model): verbose_name_plural = _(u"Datings") def __unicode__(self): - return u"%s (%d-%d)" % (self.period, self.start_date, self.end_date) + start_date = self.start_date and unicode(self.start_date) or u"" + end_date = self.end_date and unicode(self.end_date) or u"" + if not start_date and not end_date: + return unicode(self.period) + return u"%s (%s-%s)" % (self.period, start_date, end_date) class Unit(GeneralType): order = models.IntegerField(_(u"Order")) |