Change all upload directories

2 files changed, 23 insertions, 2 deletions

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 12f78e64d..71b57849e 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -25,6 +25,7 @@ from django.core.urlresolvers import reverse
 from django.db import connection, transaction
 from django.db.models import Max, Q
 from django.db.models.signals import m2m_changed, post_save, post_delete
+from django.utils.text import slugify
 from django.utils.translation import ugettext_lazy as _, ugettext
 
 from ishtar_common.data_importer import post_importer_action, ImporterError
@@ -707,7 +708,6 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
     cached_label = models.TextField(_(u"Cached name"), null=True, blank=True)
     history = HistoricalRecords()
     BASKET_MODEL = FindBasket
-    IMAGE_PREFIX = 'finds/'
 
     class Meta:
         verbose_name = _(u"Find")
@@ -777,6 +777,16 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
             return "00"
         return bf.short_id()
 
+    def _get_base_image_path(self):
+        bf = None
+        if self.id:
+            bf = self.get_first_base_find()
+        if not bf:
+            return u"detached/{}".format(self.SLUG)
+        ope = bf.context_record.operation
+        return u"operation/{}/{}/{}/{}".format(
+            ope.year, ope.reference, self.SLUG, slugify(self.reference))
+
     @property
     def administrative_index(self):
         bf = self.get_first_base_find()
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 048d3064d..866e218aa 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -92,7 +92,6 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem,
         "treatment_types__label": _(u"Type"),
         "treatment_state__label": _(u"State"),
     }
-    IMAGE_PREFIX = 'treatment'
     # extra keys than can be passed to save method
     EXTRA_SAVED_KEYS = ('items', 'user')
     SLUG = 'treatment'
@@ -202,6 +201,10 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem,
                  getattr(self, k)]
         return u'{} | {}'.format(u"-".join(items), self.treatment_types_lbl())
 
+    def _get_base_image_path(self,):
+        return u"treatment/{}/{}".format(
+            self.year, self.index)
+
     def treatment_types_lbl(self):
         """
         Treatment types label
@@ -631,6 +634,10 @@ class TreatmentSource(Source):
     def owner(self):
         return self.treatment
 
+    def _get_base_image_path(self):
+        return u"treatment/{}/{}/source".format(
+            self.treatment.year, self.treatment.index)
+
 
 class TreatmentFileSource(Source):
     treatment_file = models.ForeignKey(
@@ -660,3 +667,7 @@ class TreatmentFileSource(Source):
     @property
     def owner(self):
         return self.treatment_file
+
+    def _get_base_image_path(self):
+        return u"treatmentfile/{}/{}/source".format(
+            self.treatment_file.year, self.treatment_file.index)