summaryrefslogtreecommitdiff
path: root/ishtar/furnitures/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar/furnitures/models.py')
-rw-r--r--ishtar/furnitures/models.py6
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"))