Standardize related field item for imagee collections (refs #4076)

1 files changed, 6 insertions, 10 deletions

diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index bdb21ea39..396b91f67 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -34,7 +34,7 @@ from ishtar_common.models import GeneralType, BaseHistorizedItem, \
     HistoricalRecords, OwnPerms, ShortMenuItem, Source, GeneralRelationType,\
     GeneralRecordRelations, post_delete_record_relation, get_image_path, \
     ImageModel, post_save_cache, ValueGetter, BulkUpdatedItem, IshtarImage, \
-    RelationItem
+    RelationItem, ThroughImage
 from archaeological_operations.models import Operation, Period, Parcel, \
     ArchaeologicalSite
 
@@ -485,11 +485,8 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
         return True
 
     def _get_base_image_path(self):
-        ope = self.operation
-        return u"operation/{}/{}/{}/{}".format(
-            ope.year, ope.reference, self.SLUG,
-            slugify(self.label or u"00")
-        )
+        return self.operation._get_base_image_path() + \
+               u"/{}/{}".format(self.SLUG, slugify(self.label or u"00"))
 
     @property
     def reference(self):
@@ -565,10 +562,9 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
 post_save.connect(cached_label_changed, sender=ContextRecord)
 
 
-class ContextRecordImage(models.Model):
-    image = models.ForeignKey(IshtarImage, on_delete=models.CASCADE)
-    context_record = models.ForeignKey(ContextRecord, on_delete=models.CASCADE)
-    is_main = models.BooleanField(_(u"Main image"), default=False)
+class ContextRecordImage(ThroughImage):
+    item = models.ForeignKey(ContextRecord, on_delete=models.CASCADE,
+                             related_name='associated_images')
 
 
 class RelationType(GeneralRelationType):