summaryrefslogtreecommitdiff
path: root/archaeological_operations/models.py
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_operations/models.py')
-rw-r--r--archaeological_operations/models.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index aa72d24ec..f705ce7be 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -446,12 +446,14 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
full_ref_lbl = _(u"Ref.")
@property
def full_ref(self):
- keys = ['year', 'index']
- if settings.COUNTRY == 'fr':
- keys.append('ref_sra')
- return settings.JOINT.join(
- [getattr(self, k) and unicode(getattr(self, k)) or '-'
- for k in keys])
+ lbl = []
+ if self.year:
+ lbl.append(unicode(self.year))
+ if self.index:
+ lbl.append(u"n°%d" %self.index)
+ if settings.COUNTRY == 'fr' and self.ref_sra:
+ lbl.append(u"[%s]" % self.ref_sra)
+ return u" ".join(lbl)
@property
def year(self):