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

2 files changed, 11 insertions, 8 deletions

diff --git a/archaeological_warehouse/migrations/0017_auto_20180423_1838.py b/archaeological_warehouse/migrations/0017_auto_20180509_1747.py
index fe183c312..76b384374 100644
--- a/archaeological_warehouse/migrations/0017_auto_20180423_1838.py
+++ b/archaeological_warehouse/migrations/0017_auto_20180509_1747.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-04-23 18:38
+# Generated by Django 1.11.10 on 2018-05-09 17:47
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -9,7 +9,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('ishtar_common', '0048_auto_20180423_1838'),
+        ('ishtar_common', '0050_licensetype_url'),
         ('archaeological_warehouse', '0016_auto_20180403_1120'),
     ]
 
@@ -20,8 +20,12 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('is_main', models.BooleanField(default=False, verbose_name='Main image')),
                 ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage')),
-                ('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_warehouse.Warehouse')),
+                ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='associated_images', to='archaeological_warehouse.Warehouse')),
             ],
+            options={
+                'ordering': ('-is_main', 'image__name'),
+                'abstract': False,
+            },
         ),
         migrations.AddField(
             model_name='warehouse',
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index a860497e0..4edfe0d15 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -31,7 +31,7 @@ from ishtar_common.utils import cached_label_changed
 
 from ishtar_common.models import GeneralType, get_external_id, \
     LightHistorizedItem, OwnPerms, Address, Person, post_save_cache, \
-    ImageModel, DashboardFormItem, IshtarImage
+    ImageModel, DashboardFormItem, IshtarImage, ThroughImage
 
 
 class WarehouseType(GeneralType):
@@ -204,10 +204,9 @@ class Warehouse(Address, DashboardFormItem, OwnPerms):
                 return
 
 
-class WarehouseImage(models.Model):
-    image = models.ForeignKey(IshtarImage, on_delete=models.CASCADE)
-    warehouse = models.ForeignKey(Warehouse, on_delete=models.CASCADE)
-    is_main = models.BooleanField(_(u"Main image"), default=False)
+class WarehouseImage(ThroughImage):
+    item = models.ForeignKey(Warehouse, on_delete=models.CASCADE,
+                             related_name='associated_images')
 
 
 class Collection(LightHistorizedItem):