summaryrefslogtreecommitdiff
path: root/ishtar/furnitures/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-08 14:48:58 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2011-01-08 14:48:58 +0100
commite87f791d0fa450da71ead7148437ba95151c8eeb (patch)
tree7492ddacc34a309d671b34ba539f5f8095e6c62f /ishtar/furnitures/models.py
parent3259ae9642a0d86f9cca2c94bfba510cd55549c1 (diff)
downloadIshtar-e87f791d0fa450da71ead7148437ba95151c8eeb.tar.bz2
Ishtar-e87f791d0fa450da71ead7148437ba95151c8eeb.zip
Better style. Better confirmation page. Better management of wizard steps. (closes #63)
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 abb8c963e..e75eb9b51 100644
--- a/ishtar/furnitures/models.py
+++ b/ishtar/furnitures/models.py
@@ -259,7 +259,11 @@ class File(BaseHistorizedItem, OwnPerms):
("delete_own_file", ugettext(u"Can delete own Archaelogical file")),
)
def __unicode__(self):
- return u"%d - %s" % (self.year, self.internal_reference)
+ items = [unicode(getattr(self, k)) for k in ['internal_reference']
+ if getattr(self, k)]
+ if self.year and self.numeric_reference:
+ items = [u'%d-%d' % (self.year, self.numeric_reference)] + items
+ return u" - ".join(items)
class OperationType(GeneralType):
class Meta: