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

1 files changed, 13 insertions, 5 deletions

diff --git a/archaeological_operations/migrations/0027_auto_20180423_1838.py b/archaeological_operations/migrations/0027_auto_20180509_1723.py
index c9af8c928..181b6aa55 100644
--- a/archaeological_operations/migrations/0027_auto_20180423_1838.py
+++ b/archaeological_operations/migrations/0027_auto_20180509_1723.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:23
 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_operations', '0026_auto_20180430_1318'),
     ]
 
@@ -21,6 +21,10 @@ class Migration(migrations.Migration):
                 ('is_main', models.BooleanField(default=False, verbose_name='Main image')),
                 ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage')),
             ],
+            options={
+                'ordering': ('-is_main', 'image__name'),
+                'abstract': False,
+            },
         ),
         migrations.CreateModel(
             name='SiteImage',
@@ -28,8 +32,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')),
-                ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_operations.ArchaeologicalSite')),
+                ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='associated_images', to='archaeological_operations.ArchaeologicalSite')),
             ],
+            options={
+                'ordering': ('-is_main', 'image__name'),
+                'abstract': False,
+            },
         ),
         migrations.RemoveField(
             model_name='operation',
@@ -42,8 +50,8 @@ class Migration(migrations.Migration):
         ),
         migrations.AddField(
             model_name='operationimage',
-            name='operation',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_operations.Operation'),
+            name='item',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='associated_images', to='archaeological_operations.Operation'),
         ),
         migrations.AddField(
             model_name='archaeologicalsite',