diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-04-01 21:12:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-04-01 21:12:08 +0200 |
| commit | d905b784fd8892607f524d74ced717e017a31d21 (patch) | |
| tree | c380213cfa1aac3797b89007449a2f327a0b63b9 | |
| parent | 6373712a192f64bdceb869039e34dc0a7bfe3ef1 (diff) | |
| download | Ishtar-d905b784fd8892607f524d74ced717e017a31d21.tar.bz2 Ishtar-d905b784fd8892607f524d74ced717e017a31d21.zip | |
Complete generated filename - 2 (refs #1618)
| -rw-r--r-- | archaeological_operations/models.py | 3 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
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')) |