Adapt migrations - M2M cannot be simply migrate (refs #4076)

5 files changed, 41 insertions, 5 deletions

diff --git a/archaeological_context_records/migrations/0020_auto_20180423_1838.py b/archaeological_context_records/migrations/0020_auto_20180423_1838.py
index fb0c7463f..11995b0c6 100644
--- a/archaeological_context_records/migrations/0020_auto_20180423_1838.py
+++ b/archaeological_context_records/migrations/0020_auto_20180423_1838.py
@@ -21,7 +21,11 @@ class Migration(migrations.Migration):
                 ('is_main', models.BooleanField(default=False, verbose_name='Main image')),
             ],
         ),
-        migrations.AlterField(
+        migrations.RemoveField(
+            model_name='contextrecord',
+            name='images',
+        ),
+        migrations.AddField(
             model_name='contextrecord',
             name='images',
             field=models.ManyToManyField(blank=True, through='archaeological_context_records.ContextRecordImage', to='ishtar_common.IshtarImage', verbose_name='Images'),
diff --git a/archaeological_finds/migrations/0024_auto_20180423_1838.py b/archaeological_finds/migrations/0024_auto_20180423_1838.py
index 58cf42880..faed5b69f 100644
--- a/archaeological_finds/migrations/0024_auto_20180423_1838.py
+++ b/archaeological_finds/migrations/0024_auto_20180423_1838.py
@@ -30,12 +30,20 @@ class Migration(migrations.Migration):
                 ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage')),
             ],
         ),
-        migrations.AlterField(
+        migrations.RemoveField(
+            model_name='find',
+            name='images',
+        ),
+        migrations.AddField(
             model_name='find',
             name='images',
             field=models.ManyToManyField(blank=True, through='archaeological_finds.FindImage', to='ishtar_common.IshtarImage', verbose_name='Images'),
         ),
-        migrations.AlterField(
+        migrations.RemoveField(
+            model_name='treatment',
+            name='images',
+        ),
+        migrations.AddField(
             model_name='treatment',
             name='images',
             field=models.ManyToManyField(blank=True, through='archaeological_finds.TreatmentImage', to='ishtar_common.IshtarImage', verbose_name='Images'),
diff --git a/archaeological_operations/migrations/0026_auto_20180423_1838.py b/archaeological_operations/migrations/0026_auto_20180423_1838.py
index c512a54f0..5b196e728 100644
--- a/archaeological_operations/migrations/0026_auto_20180423_1838.py
+++ b/archaeological_operations/migrations/0026_auto_20180423_1838.py
@@ -31,7 +31,11 @@ class Migration(migrations.Migration):
                 ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_operations.ArchaeologicalSite')),
             ],
         ),
-        migrations.AlterField(
+        migrations.RemoveField(
+            model_name='operation',
+            name='images',
+        ),
+        migrations.AddField(
             model_name='operation',
             name='images',
             field=models.ManyToManyField(blank=True, through='archaeological_operations.OperationImage', to='ishtar_common.IshtarImage', verbose_name='Images'),
diff --git a/ishtar_common/migrations/0049_auto_20180423_1857.py b/ishtar_common/migrations/0049_auto_20180423_1857.py
new file mode 100644
index 000000000..9934bf47f
--- /dev/null
+++ b/ishtar_common/migrations/0049_auto_20180423_1857.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-04-23 18:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ishtar_common', '0048_auto_20180423_1838'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='ishtarimage',
+            name='name',
+            field=models.CharField(blank=True, max_length=250, null=True, verbose_name='Name'),
+        ),
+    ]
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 4d8243af4..3a0bb853f 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -3040,7 +3040,7 @@ class ImageType(GeneralType):
 
 
 class IshtarImage(ImageModel):
-    name = models.CharField(_(u"Name"), max_length=250)
+    name = models.CharField(_(u"Name"), max_length=250, blank=True, null=True)
     description = models.TextField(_(u"Description"), blank=True, null=True)
     licenses = models.ManyToManyField(LicenseType, verbose_name=_(u"License"),
                                       blank=True)