From 7baf631b85b199e17737871aa88b253a20ebdc1b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 1 Apr 2014 20:53:16 +0200 Subject: Complete generated filename (refs #1618) --- archaeological_operations/models.py | 4 ++++ ishtar_common/models.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 @@ -213,6 +213,10 @@ class Operation(BaseHistorizedItem, OwnPerms, ValueGetter): return self.code_patriarche 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')) -- cgit v1.2.3