Migrate single image to M2M (refs #4076)

3 files changed, 66 insertions, 3 deletions

diff --git a/archaeological_finds/migrations/0025_migrate_image.py b/archaeological_finds/migrations/0025_migrate_image.py
new file mode 100644
index 000000000..dccbb444b
--- /dev/null
+++ b/archaeological_finds/migrations/0025_migrate_image.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-05-11 12:07
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+from ishtar_common.utils_migrations import migrate_simple_image_to_m2m
+
+
+def migrate_image(apps, schema_editor):
+    Find = apps.get_model('archaeological_finds', 'Find')
+    IshtarImage = apps.get_model('ishtar_common', 'IshtarImage')
+    FindImage = apps.get_model('archaeological_finds',
+                               'FindImage')
+    migrate_simple_image_to_m2m(Find, IshtarImage, FindImage)
+
+    Treatment = apps.get_model('archaeological_finds', 'Treatment')
+    IshtarImage = apps.get_model('ishtar_common', 'IshtarImage')
+    TreatmentImage = apps.get_model('archaeological_finds',
+                                    'TreatmentImage')
+    migrate_simple_image_to_m2m(Treatment, IshtarImage, TreatmentImage)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0024_auto_20180509_1742'),
+    ]
+
+    operations = [
+        migrations.RunPython(migrate_image),
+    ]
diff --git a/archaeological_finds/migrations/0026_auto_20180511_1233.py b/archaeological_finds/migrations/0026_auto_20180511_1233.py
new file mode 100644
index 000000000..15581ae8b
--- /dev/null
+++ b/archaeological_finds/migrations/0026_auto_20180511_1233.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-05-11 12:33
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0025_migrate_image'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='find',
+            name='image',
+        ),
+        migrations.RemoveField(
+            model_name='find',
+            name='thumbnail',
+        ),
+        migrations.RemoveField(
+            model_name='historicalfind',
+            name='image',
+        ),
+        migrations.RemoveField(
+            model_name='historicalfind',
+            name='thumbnail',
+        ),
+    ]
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index dcf542f79..2b903e66a 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -32,7 +32,7 @@ from django.utils.translation import ugettext_lazy as _
 from ishtar_common.data_importer import post_importer_action, ImporterError
 from ishtar_common.utils import cached_label_changed, post_save_point
 
-from ishtar_common.models import GeneralType, HierarchicalType, ImageModel, \
+from ishtar_common.models import GeneralType, HierarchicalType, \
     BaseHistorizedItem, ShortMenuItem, LightHistorizedItem, \
     HistoricalRecords, OwnPerms, Source, Person, Basket, post_save_cache, \
     ValueGetter, get_current_profile, IshtarImage, ThroughImage
@@ -580,8 +580,8 @@ class FBulkView(object):
     """
 
 
-class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
-           OwnPerms, ShortMenuItem):
+class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
+           ShortMenuItem):
     EXTERNAL_ID_KEY = 'find_external_id'
     CHECK_DICT = dict(CHECK_CHOICES)
     SHOW_URL = 'show-find'