summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archaeological_operations/models.py3
-rw-r--r--ishtar_common/models.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 021d37c52..5f186e19c 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -515,6 +515,9 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
filename = u"-".join(filename.split('-')[:-1]) # remove date
if self.act_type.code:
filename += u"-" + self.act_type.code
+ if self.signature_date and self.index:
+ filename += u"-%d-%d" % (self.signature_date.year,
+ self.index)
if self.signature_date:
filename += u"-" + self.signature_date.strftime('%Y%m%d')
return filename
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index a2da684c5..db2fb8f33 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -509,7 +509,7 @@ class BaseHistorizedItem(models.Model):
slugify(self.get_town_label()).upper(),
slugify(self.short_class_name),
slugify(self.reference),
- slugify(self.name or '').replace('-', '_').capitalize()]
+ self.name or '']
last_edition_date = self.last_edition_date
if last_edition_date:
items.append(last_edition_date.strftime('%Y%m%d'))