Migrate main image: fix migration script

5 files changed, 91 insertions, 2 deletions

diff --git a/archaeological_context_records/migrations/0038_migrate_main_image.py b/archaeological_context_records/migrations/0038_migrate_main_image.py
new file mode 100644
index 000000000..91a365e16
--- /dev/null
+++ b/archaeological_context_records/migrations/0038_migrate_main_image.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-12-20 19:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+from ishtar_common.utils_migrations import migrate_main_image
+
+
+def migrate_main_image_script(apps, schema):
+    migrate_main_image(apps, 'archaeological_context_records', 'ContextRecord')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_context_records', '0037_auto_20190118_1203'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_main_image_script)
+    ]
diff --git a/archaeological_finds/migrations/0057_migrate_main_image.py b/archaeological_finds/migrations/0057_migrate_main_image.py
new file mode 100644
index 000000000..dceff0ea0
--- /dev/null
+++ b/archaeological_finds/migrations/0057_migrate_main_image.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-12-20 19:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+from ishtar_common.utils_migrations import migrate_main_image
+
+
+def migrate_main_image_script(apps, schema):
+    migrate_main_image(apps, 'archaeological_finds', 'Find', verbose=True)
+    migrate_main_image(apps, 'archaeological_finds', 'Treatment', verbose=True)
+    migrate_main_image(apps, 'archaeological_finds', 'TreatmentFile',
+                       verbose=True)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0056_auto_20190118_1203'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_main_image_script)
+    ]
diff --git a/archaeological_operations/migrations/0046_migrate_main_image.py b/archaeological_operations/migrations/0046_migrate_main_image.py
new file mode 100644
index 000000000..7f2b39d69
--- /dev/null
+++ b/archaeological_operations/migrations/0046_migrate_main_image.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-12-20 19:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+from ishtar_common.utils_migrations import migrate_main_image
+
+
+def migrate_main_image_script(apps, schema):
+    migrate_main_image(apps, 'archaeological_operations', 'Operation')
+    migrate_main_image(apps, 'archaeological_operations', 'ArchaeologicalSite')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_operations', '0045_auto_20190118_1203'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_main_image_script)
+    ]
diff --git a/archaeological_warehouse/migrations/0031_migrate_main_image.py b/archaeological_warehouse/migrations/0031_migrate_main_image.py
new file mode 100644
index 000000000..dae104ace
--- /dev/null
+++ b/archaeological_warehouse/migrations/0031_migrate_main_image.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-12-20 19:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+from ishtar_common.utils_migrations import migrate_main_image
+
+
+def migrate_main_image_script(apps, schema):
+    migrate_main_image(apps, 'archaeological_warehouse', 'Warehouse')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_warehouse', '0030_auto_20190118_1203'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_main_image_script)
+    ]
diff --git a/ishtar_common/utils_migrations.py b/ishtar_common/utils_migrations.py
index f51465262..7d61f36d8 100644
--- a/ishtar_common/utils_migrations.py
+++ b/ishtar_common/utils_migrations.py
@@ -117,8 +117,8 @@ def migrate_main_image(apps, app_name, model_name, verbose=False):
             sys.stdout.flush()
         q = item.documents.filter(
             image__isnull=False).exclude(image='')
-        if not q.count():
-            return
+        if not q.count():  # no image
+            continue
         # by default get the lowest pk
         item.main_image = q.order_by('pk').all()[0]
         item.skip_history_when_saving = True