diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2014-04-01 20:53:16 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2014-04-01 20:53:16 +0200 |
commit | 7baf631b85b199e17737871aa88b253a20ebdc1b (patch) | |
tree | 63a093471436be3c2099473670605f70a45894d3 | |
parent | 2902a21088ea21ae1291f10eea4e5a2ff9ea0207 (diff) | |
download | Ishtar-7baf631b85b199e17737871aa88b253a20ebdc1b.tar.bz2 Ishtar-7baf631b85b199e17737871aa88b253a20ebdc1b.zip |
Complete generated filename (refs #1618)
-rw-r--r-- | archaeological_operations/models.py | 4 | ||||
-rw-r--r-- | ishtar_common/models.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 8180707bc..021d37c52 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -214,6 +214,10 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter): return unicode(self) @property + def name(self): + return self.common_name + + @property def show_url(self): return reverse('show-operation', args=[self.pk, '']) diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 324f3ced2..a2da684c5 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -508,7 +508,8 @@ class BaseHistorizedItem(models.Model): items = [slugify(self.get_department()), slugify(self.get_town_label()).upper(), slugify(self.short_class_name), - slugify(self.reference)] + slugify(self.reference), + slugify(self.name or '').replace('-', '_').capitalize()] last_edition_date = self.last_edition_date if last_edition_date: items.append(last_edition_date.strftime('%Y%m%d')) |