From 4bae312cbdffe51452122e2819b0cda28ef9f733 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 31 Mar 2011 22:16:26 +0200 Subject: Correct a bug in period presentation --- ishtar/furnitures/models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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")) -- cgit v1.2.3