summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne@peacefrogs.net>2019-02-06 14:41:19 +0100
committerÉtienne Loks <etienne@peacefrogs.net>2019-02-06 14:45:08 +0100
commit4cbb3429c3243e93597c2d2fbc668b444499c728 (patch)
tree873f1337aa01cfe97d6d5a0d8cb1ceb6c27408b6
parentfa7c887d6321601219912e2be3395dfc6e415518 (diff)
downloadIshtar-4cbb3429c3243e93597c2d2fbc668b444499c728.tar.bz2
Ishtar-4cbb3429c3243e93597c2d2fbc668b444499c728.zip
Main image: fix bad "on_delete" behaviour
-rw-r--r--archaeological_context_records/migrations/0039_auto_20190206_1442.py21
-rw-r--r--archaeological_context_records/models.py1
-rw-r--r--archaeological_finds/migrations/0059_auto_20190206_1442.py47
-rw-r--r--archaeological_finds/models_finds.py1
-rw-r--r--archaeological_finds/models_treatments.py2
-rw-r--r--archaeological_operations/migrations/0047_auto_20190206_1442.py26
-rw-r--r--archaeological_operations/models.py2
-rw-r--r--archaeological_warehouse/migrations/0032_auto_20190206_1442.py21
-rw-r--r--archaeological_warehouse/models.py1
9 files changed, 122 insertions, 0 deletions
diff --git a/archaeological_context_records/migrations/0039_auto_20190206_1442.py b/archaeological_context_records/migrations/0039_auto_20190206_1442.py
new file mode 100644
index 000000000..79f5be9af
--- /dev/null
+++ b/archaeological_context_records/migrations/0039_auto_20190206_1442.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-02-06 14:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archaeological_context_records', '0038_migrate_main_image'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='contextrecord',
+ name='main_image',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_image_context_records', to='ishtar_common.Document', verbose_name='Main image'),
+ ),
+ ]
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index d2337db81..72b355ac9 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -472,6 +472,7 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
blank=True)
main_image = models.ForeignKey(
Document, related_name='main_image_context_records',
+ on_delete=models.SET_NULL,
verbose_name=_(u"Main image"), blank=True, null=True)
cached_label = models.TextField(_(u"Cached name"), null=True, blank=True,
db_index=True)
diff --git a/archaeological_finds/migrations/0059_auto_20190206_1442.py b/archaeological_finds/migrations/0059_auto_20190206_1442.py
new file mode 100644
index 000000000..69183c9e5
--- /dev/null
+++ b/archaeological_finds/migrations/0059_auto_20190206_1442.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-02-06 14:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archaeological_finds', '0058_views_find_nonmodif_treatments'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='FindNonModifTreatments',
+ fields=[
+ ('treatment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='archaeological_finds.Treatment', verbose_name='Traitement')),
+ ('treatment_nb', models.IntegerField(verbose_name='Ordre')),
+ ],
+ options={
+ 'ordering': ('find', '-treatment_nb'),
+ 'db_table': 'find_nonmodif_treatments',
+ 'managed': False,
+ },
+ ),
+ migrations.AlterModelOptions(
+ name='treatment',
+ options={'ordering': ('-year', '-index', '-start_date'), 'permissions': (('view_treatment', 'Can view all Treatments'), ('view_own_treatment', 'Can view own Treatment'), ('add_own_treatment', 'Can add own Treatment'), ('change_own_treatment', 'Can change own Treatment'), ('delete_own_treatment', 'Can delete own Treatment')), 'verbose_name': 'Traitement', 'verbose_name_plural': 'Traitements'},
+ ),
+ migrations.AlterField(
+ model_name='find',
+ name='main_image',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_image_finds', to='ishtar_common.Document', verbose_name='Main image'),
+ ),
+ migrations.AlterField(
+ model_name='treatment',
+ name='main_image',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_image_treatments', to='ishtar_common.Document', verbose_name='Main image'),
+ ),
+ migrations.AlterField(
+ model_name='treatmentfile',
+ name='main_image',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_image_treatment_files', to='ishtar_common.Document', verbose_name='Main image'),
+ ),
+ ]
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index e38e0fe14..1bc774aa2 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -1206,6 +1206,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
blank=True)
main_image = models.ForeignKey(
Document, related_name='main_image_finds',
+ on_delete=models.SET_NULL,
verbose_name=_(u"Main image"), blank=True, null=True)
treatments = models.ManyToManyField(
"Treatment", verbose_name=_(u"Treatments"),
diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py
index 7d9b8ebb6..a1e0a0437 100644
--- a/archaeological_finds/models_treatments.py
+++ b/archaeological_finds/models_treatments.py
@@ -181,6 +181,7 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem,
blank=True)
main_image = models.ForeignKey(
Document, related_name='main_image_treatments',
+ on_delete=models.SET_NULL,
verbose_name=_(u"Main image"), blank=True, null=True)
cached_label = models.TextField(_(u"Cached name"), null=True, blank=True,
db_index=True)
@@ -934,6 +935,7 @@ class TreatmentFile(DashboardFormItem, ClosedItem, BaseHistorizedItem,
blank=True)
main_image = models.ForeignKey(
Document, related_name='main_image_treatment_files',
+ on_delete=models.SET_NULL,
verbose_name=_(u"Main image"), blank=True, null=True)
associated_basket = models.ForeignKey(
FindBasket, null=True, blank=True, on_delete=models.SET_NULL,
diff --git a/archaeological_operations/migrations/0047_auto_20190206_1442.py b/archaeological_operations/migrations/0047_auto_20190206_1442.py
new file mode 100644
index 000000000..b4de62f23
--- /dev/null
+++ b/archaeological_operations/migrations/0047_auto_20190206_1442.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-02-06 14:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archaeological_operations', '0046_migrate_main_image'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='main_image',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_image_sites', to='ishtar_common.Document', verbose_name='Main image'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='main_image',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_image_operations', to='ishtar_common.Document', verbose_name='Main image'),
+ ),
+ ]
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index e711def95..162692e20 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -266,6 +266,7 @@ class ArchaeologicalSite(BaseHistorizedItem, OwnPerms, ValueGetter,
blank=True)
main_image = models.ForeignKey(
Document, related_name='main_image_sites',
+ on_delete=models.SET_NULL,
verbose_name=_(u"Main image"), blank=True, null=True)
cached_label = models.TextField(_(u"Cached name"),
null=True, blank=True, db_index=True)
@@ -853,6 +854,7 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
blank=True)
main_image = models.ForeignKey(
Document, related_name='main_image_operations',
+ on_delete=models.SET_NULL,
verbose_name=_(u"Main image"), blank=True, null=True)
cached_label = models.CharField(_(u"Cached name"), max_length=500,
null=True, blank=True, db_index=True)
diff --git a/archaeological_warehouse/migrations/0032_auto_20190206_1442.py b/archaeological_warehouse/migrations/0032_auto_20190206_1442.py
new file mode 100644
index 000000000..fefe41ebe
--- /dev/null
+++ b/archaeological_warehouse/migrations/0032_auto_20190206_1442.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2019-02-06 14:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archaeological_warehouse', '0031_migrate_main_image'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='warehouse',
+ name='main_image',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_image_warehouses', to='ishtar_common.Document', verbose_name='Main image'),
+ ),
+ ]
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 34ccba88d..659688a2b 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -86,6 +86,7 @@ class Warehouse(Address, DashboardFormItem, OwnPerms,
blank=True)
main_image = models.ForeignKey(
Document, related_name='main_image_warehouses',
+ on_delete=models.SET_NULL,
verbose_name=_(u"Main image"), blank=True, null=True)
external_id = models.TextField(_(u"External ID"), blank=True, null=True)
auto_external_id = models.BooleanField(