diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-22 17:40:17 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-22 17:40:17 +0200 |
| commit | 2263cc5b8ec9057da4b3391cc1af31a6b8e75526 (patch) | |
| tree | 00222e0f5ed67fe2459874f05c8ed7214ee4c433 | |
| parent | f88edd03db806b846ad10c68279a1a7c4902f3ee (diff) | |
| download | Ishtar-2263cc5b8ec9057da4b3391cc1af31a6b8e75526.tar.bz2 Ishtar-2263cc5b8ec9057da4b3391cc1af31a6b8e75526.zip | |
Document: fix path for ea, treatment file, site documents
| -rw-r--r-- | archaeological_finds/models_treatments.py | 3 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 3 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 5506afae0..291a75d4c 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -666,6 +666,9 @@ class TreatmentFile(DashboardFormItem, ClosedItem, BaseHistorizedItem, getattr(self, k)] return settings.JOINT.join(items) + def _get_base_image_path(self,): + return u"{}/{}/{}".format(self.SLUG, self.year, self.index) + def pre_save(self): # is not new if self.pk is not None: diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 1ff66e195..34e2e4716 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -268,6 +268,9 @@ class ArchaeologicalSite(BaseHistorizedItem): def towns_label(self): return u" - ".join(self.towns_codes()) + def _get_base_image_path(self): + return u"{}/{}".format(self.SLUG, self.reference) + def create_or_update_top_operation(self, create=False): """ Create a virtual operation to associate with the site. diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 852b64706..1637bc8eb 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -103,7 +103,7 @@ class Warehouse(Address, DashboardFormItem, OwnPerms): return self.name def _get_base_image_path(self): - return u"{}/{}".format(self.SLUG, slugify(self.name)) + return u"{}/{}".format(self.SLUG, self.external_id) @property def location_types(self): |
