Migrations to clean older models for images and sources (refs #4107)

6 files changed, 339 insertions, 2 deletions

diff --git a/archaeological_context_records/migrations/0026_auto_20180601_1555.py b/archaeological_context_records/migrations/0026_auto_20180601_1555.py
new file mode 100644
index 000000000..44a277279
--- /dev/null
+++ b/archaeological_context_records/migrations/0026_auto_20180601_1555.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-06-01 15:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_context_records', '0025_migrate_source_and_image'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='contextrecordimage',
+            name='image',
+        ),
+        migrations.RemoveField(
+            model_name='contextrecordimage',
+            name='item',
+        ),
+        migrations.RemoveField(
+            model_name='contextrecordsource',
+            name='authors',
+        ),
+        migrations.RemoveField(
+            model_name='contextrecordsource',
+            name='context_record',
+        ),
+        migrations.RemoveField(
+            model_name='contextrecordsource',
+            name='format_type',
+        ),
+        migrations.RemoveField(
+            model_name='contextrecordsource',
+            name='licenses',
+        ),
+        migrations.RemoveField(
+            model_name='contextrecordsource',
+            name='source_type',
+        ),
+        migrations.RemoveField(
+            model_name='contextrecordsource',
+            name='support_type',
+        ),
+        migrations.RemoveField(
+            model_name='contextrecord',
+            name='images',
+        ),
+        migrations.DeleteModel(
+            name='ContextRecordImage',
+        ),
+        migrations.DeleteModel(
+            name='ContextRecordSource',
+        ),
+    ]
diff --git a/archaeological_finds/migrations/0029_auto_20180601_1555.py b/archaeological_finds/migrations/0029_auto_20180601_1555.py
new file mode 100644
index 000000000..3555d54b2
--- /dev/null
+++ b/archaeological_finds/migrations/0029_auto_20180601_1555.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-06-01 15:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_finds', '0028_migrate_source_and_image'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='findimage',
+            name='image',
+        ),
+        migrations.RemoveField(
+            model_name='findimage',
+            name='item',
+        ),
+        migrations.RemoveField(
+            model_name='findsource',
+            name='authors',
+        ),
+        migrations.RemoveField(
+            model_name='findsource',
+            name='find',
+        ),
+        migrations.RemoveField(
+            model_name='findsource',
+            name='format_type',
+        ),
+        migrations.RemoveField(
+            model_name='findsource',
+            name='licenses',
+        ),
+        migrations.RemoveField(
+            model_name='findsource',
+            name='source_type',
+        ),
+        migrations.RemoveField(
+            model_name='findsource',
+            name='support_type',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentfilesource',
+            name='authors',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentfilesource',
+            name='format_type',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentfilesource',
+            name='licenses',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentfilesource',
+            name='source_type',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentfilesource',
+            name='support_type',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentfilesource',
+            name='treatment_file',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentimage',
+            name='image',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentimage',
+            name='item',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentsource',
+            name='authors',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentsource',
+            name='format_type',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentsource',
+            name='licenses',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentsource',
+            name='source_type',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentsource',
+            name='support_type',
+        ),
+        migrations.RemoveField(
+            model_name='treatmentsource',
+            name='treatment',
+        ),
+        migrations.RemoveField(
+            model_name='find',
+            name='images',
+        ),
+        migrations.RemoveField(
+            model_name='treatment',
+            name='images',
+        ),
+        migrations.DeleteModel(
+            name='FindImage',
+        ),
+        migrations.DeleteModel(
+            name='FindSource',
+        ),
+        migrations.DeleteModel(
+            name='TreatmentFileSource',
+        ),
+        migrations.DeleteModel(
+            name='TreatmentImage',
+        ),
+        migrations.DeleteModel(
+            name='TreatmentSource',
+        ),
+    ]
diff --git a/archaeological_operations/migrations/0032_auto_20180601_1555.py b/archaeological_operations/migrations/0032_auto_20180601_1555.py
new file mode 100644
index 000000000..a2ef73ad1
--- /dev/null
+++ b/archaeological_operations/migrations/0032_auto_20180601_1555.py
@@ -0,0 +1,72 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-06-01 15:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_operations', '0031_migrate_source_and_image'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='operationimage',
+            name='image',
+        ),
+        migrations.RemoveField(
+            model_name='operationimage',
+            name='item',
+        ),
+        migrations.RemoveField(
+            model_name='operationsource',
+            name='authors',
+        ),
+        migrations.RemoveField(
+            model_name='operationsource',
+            name='format_type',
+        ),
+        migrations.RemoveField(
+            model_name='operationsource',
+            name='licenses',
+        ),
+        migrations.RemoveField(
+            model_name='operationsource',
+            name='operation',
+        ),
+        migrations.RemoveField(
+            model_name='operationsource',
+            name='source_type',
+        ),
+        migrations.RemoveField(
+            model_name='operationsource',
+            name='support_type',
+        ),
+        migrations.RemoveField(
+            model_name='siteimage',
+            name='image',
+        ),
+        migrations.RemoveField(
+            model_name='siteimage',
+            name='item',
+        ),
+        migrations.RemoveField(
+            model_name='archaeologicalsite',
+            name='images',
+        ),
+        migrations.RemoveField(
+            model_name='operation',
+            name='images',
+        ),
+        migrations.DeleteModel(
+            name='OperationImage',
+        ),
+        migrations.DeleteModel(
+            name='OperationSource',
+        ),
+        migrations.DeleteModel(
+            name='SiteImage',
+        ),
+    ]
diff --git a/archaeological_warehouse/migrations/0021_auto_20180601_1555.py b/archaeological_warehouse/migrations/0021_auto_20180601_1555.py
new file mode 100644
index 000000000..4695a64ee
--- /dev/null
+++ b/archaeological_warehouse/migrations/0021_auto_20180601_1555.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-06-01 15:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_warehouse', '0020_migrate_source_and_image'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='warehouseimage',
+            name='image',
+        ),
+        migrations.RemoveField(
+            model_name='warehouseimage',
+            name='item',
+        ),
+        migrations.RemoveField(
+            model_name='warehouse',
+            name='images',
+        ),
+        migrations.DeleteModel(
+            name='WarehouseImage',
+        ),
+    ]
diff --git a/ishtar_common/migrations/0056_auto_20180601_1555.py b/ishtar_common/migrations/0056_auto_20180601_1555.py
new file mode 100644
index 000000000..fee995df9
--- /dev/null
+++ b/ishtar_common/migrations/0056_auto_20180601_1555.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-06-01 15:55
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import ishtar_common.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_warehouse', '0021_auto_20180601_1555'),
+        ('archaeological_context_records', '0026_auto_20180601_1555'),
+        ('archaeological_finds', '0029_auto_20180601_1555'),
+        ('archaeological_operations', '0032_auto_20180601_1555'),
+        ('ishtar_common', '0055_auto_20180530_1900'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ishtarimage',
+            name='authors',
+        ),
+        migrations.RemoveField(
+            model_name='ishtarimage',
+            name='format_type',
+        ),
+        migrations.RemoveField(
+            model_name='ishtarimage',
+            name='licenses',
+        ),
+        migrations.RemoveField(
+            model_name='ishtarimage',
+            name='source_type',
+        ),
+        migrations.RemoveField(
+            model_name='ishtarimage',
+            name='support_type',
+        ),
+        migrations.AlterModelOptions(
+            name='document',
+            options={'ordering': ('title',), 'permissions': (('view_document', 'Can view all Documents'), ('view_own_document', 'Can view own Document'), ('add_own_document', 'Can add own Document'), ('change_own_document', 'Can change own Document'), ('delete_own_document', 'Can delete own Document')), 'verbose_name': 'Document', 'verbose_name_plural': 'Documents'},
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='associated_file',
+            field=models.FileField(blank=True, max_length=255, null=True, upload_to=ishtar_common.models.get_image_path),
+        ),
+        migrations.DeleteModel(
+            name='IshtarImage',
+        ),
+    ]
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 995a2c136..76f16eaae 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -3096,9 +3096,9 @@ class Document(OwnPerms, ImageModel, FullSearch):
 
     LINK_SPLIT = u"<||>"
 
-
-
     title = models.TextField(_(u"Title"), blank=True, default='')
+    associated_file = models.FileField(
+        upload_to=get_image_path, blank=True, null=True, max_length=255)
     index = models.IntegerField(verbose_name=_(u"Index"), blank=True,
                                 null=True)
     external_id = models.TextField(_(u"External ID"), null=True, blank=True)