summaryrefslogtreecommitdiff
path: root/archaeological_operations
diff options
context:
space:
mode:
Diffstat (limited to 'archaeological_operations')
-rw-r--r--archaeological_operations/migrations/0028_migrate_image.py26
-rw-r--r--archaeological_operations/migrations/0029_auto_20180511_1232.py31
-rw-r--r--archaeological_operations/models.py7
3 files changed, 60 insertions, 4 deletions
diff --git a/archaeological_operations/migrations/0028_migrate_image.py b/archaeological_operations/migrations/0028_migrate_image.py
new file mode 100644
index 000000000..a7a0e0495
--- /dev/null
+++ b/archaeological_operations/migrations/0028_migrate_image.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-05-11 10:49
+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):
+ Operation = apps.get_model('archaeological_operations', 'Operation')
+ IshtarImage = apps.get_model('ishtar_common', 'IshtarImage')
+ OperationImage = apps.get_model('archaeological_operations',
+ 'OperationImage')
+ migrate_simple_image_to_m2m(Operation, IshtarImage, OperationImage)
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archaeological_operations', '0027_auto_20180509_1723'),
+ ]
+
+ operations = [
+ migrations.RunPython(migrate_image),
+ ]
diff --git a/archaeological_operations/migrations/0029_auto_20180511_1232.py b/archaeological_operations/migrations/0029_auto_20180511_1232.py
new file mode 100644
index 000000000..5f1a2c19a
--- /dev/null
+++ b/archaeological_operations/migrations/0029_auto_20180511_1232.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-05-11 12:32
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archaeological_operations', '0028_migrate_image'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='historicaloperation',
+ name='image',
+ ),
+ migrations.RemoveField(
+ model_name='historicaloperation',
+ name='thumbnail',
+ ),
+ migrations.RemoveField(
+ model_name='operation',
+ name='image',
+ ),
+ migrations.RemoveField(
+ model_name='operation',
+ name='thumbnail',
+ ),
+ ]
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 5ff3ddc2f..44406fd89 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -38,8 +38,7 @@ from ishtar_common.models import GeneralType, BaseHistorizedItem, \
SourceType, Person, Organization, Town, Dashboard, IshtarUser, ValueGetter,\
DocumentTemplate, ShortMenuItem, DashboardFormItem, GeneralRelationType,\
GeneralRecordRelations, post_delete_record_relation, OperationType, \
- ImageModel, post_save_cache, PersonType, IshtarImage, \
- RelationItem, ThroughImage
+ post_save_cache, PersonType, IshtarImage, RelationItem, ThroughImage
class RemainType(GeneralType):
@@ -279,8 +278,8 @@ class ClosedItem(object):
return {'date': date, 'user': user}
-class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms,
- ValueGetter, ShortMenuItem, DashboardFormItem, RelationItem):
+class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
+ ShortMenuItem, DashboardFormItem, RelationItem):
QUALITY_DICT = dict(QUALITY)
SHOW_URL = 'show-operation'
TABLE_COLS = ['year', 'towns', 'common_name', 'operation_type',