From b066feee610638e3b75d3c6054d312c8e3726fbb Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 11 Jul 2022 10:28:39 +0200 Subject: Fix migrations --- .../migrations/0108_auto_20220707_1633.py | 54 ----- .../migrations/0109_auto_20220711_1024.py | 45 ++++ .../migrations/0108_auto_20220328_1222.py | 17 -- .../migrations/0109_auto_20220328_1222.py | 241 ------------------- .../migrations/0109_auto_20220711_1025.py | 256 +++++++++++++++++++++ .../migrations/0110_auto_20220707_1633.py | 65 ------ 6 files changed, 301 insertions(+), 377 deletions(-) delete mode 100644 archaeological_files/migrations/0108_auto_20220707_1633.py create mode 100644 archaeological_files/migrations/0109_auto_20220711_1024.py delete mode 100644 archaeological_operations/migrations/0108_auto_20220328_1222.py delete mode 100644 archaeological_operations/migrations/0109_auto_20220328_1222.py create mode 100644 archaeological_operations/migrations/0109_auto_20220711_1025.py delete mode 100644 archaeological_operations/migrations/0110_auto_20220707_1633.py diff --git a/archaeological_files/migrations/0108_auto_20220707_1633.py b/archaeological_files/migrations/0108_auto_20220707_1633.py deleted file mode 100644 index fe50e8fed..000000000 --- a/archaeological_files/migrations/0108_auto_20220707_1633.py +++ /dev/null @@ -1,54 +0,0 @@ -# Generated by Django 2.2.24 on 2022-07-07 16:33 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0107_auto_20220705_1612'), - ] - - operations = [ - migrations.AlterModelOptions( - name='priceagreement', - options={'ordering': ('order', 'start_date', 'end_date', 'label'), 'verbose_name': 'Price agreement', 'verbose_name_plural': 'Price agreement'}, - ), - migrations.AlterField( - model_name='equipmentservicecost', - name='unit', - field=models.CharField(blank=True, choices=[('D', 'days'), ('W', 'weeks'), ('M', 'months'), ('L', 'linear m.')], max_length=1, null=True, verbose_name='Unit'), - ), - migrations.AlterField( - model_name='file', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='file', - name='file_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archaeological_files.FileType', verbose_name='File type'), - ), - migrations.AlterField( - model_name='file', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='historicalfile', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='historicalfile', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='job', - name='child', - field=models.ForeignKey(blank=True, help_text='Auto-add this job when a parent is added', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parents', to='archaeological_files.Job', verbose_name='Child'), - ), - ] diff --git a/archaeological_files/migrations/0109_auto_20220711_1024.py b/archaeological_files/migrations/0109_auto_20220711_1024.py new file mode 100644 index 000000000..05ed60586 --- /dev/null +++ b/archaeological_files/migrations/0109_auto_20220711_1024.py @@ -0,0 +1,45 @@ +# Generated by Django 2.2.24 on 2022-07-11 10:24 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_files', '0108_auto_20220711_0128'), + ] + + operations = [ + migrations.AlterField( + model_name='file', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='file', + name='file_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archaeological_files.FileType', verbose_name='File type'), + ), + migrations.AlterField( + model_name='file', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='historicalfile', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='historicalfile', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='job', + name='child', + field=models.ForeignKey(blank=True, help_text='Auto-add this job when a parent is added', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parents', to='archaeological_files.Job', verbose_name='Child'), + ), + ] diff --git a/archaeological_operations/migrations/0108_auto_20220328_1222.py b/archaeological_operations/migrations/0108_auto_20220328_1222.py deleted file mode 100644 index 507616b63..000000000 --- a/archaeological_operations/migrations/0108_auto_20220328_1222.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.2.24 on 2022-03-28 12:22 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0107_auto_20210326_1434'), - ] - - operations = [ - migrations.AlterModelOptions( - name='parcel', - options={'ordering': ('town', 'year', 'section', 'parcel_number'), 'verbose_name': 'Parcel', 'verbose_name_plural': 'Parcels'}, - ), - ] diff --git a/archaeological_operations/migrations/0109_auto_20220328_1222.py b/archaeological_operations/migrations/0109_auto_20220328_1222.py deleted file mode 100644 index 9d49dfb01..000000000 --- a/archaeological_operations/migrations/0109_auto_20220328_1222.py +++ /dev/null @@ -1,241 +0,0 @@ -# Generated by Django 2.2.24 on 2022-03-28 12:22 - -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0217_auto_20220328_1222'), - ('archaeological_operations', '0108_auto_20220328_1222'), - ] - - operations = [ - migrations.AddField( - model_name='archaeologicalsite', - name='geodata', - field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_operations_archaeologicalsite', to='ishtar_common.GeoVectorData'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='main_geodata', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_operations_archaeologicalsite', to='ishtar_common.GeoVectorData'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='main_geodata', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData'), - ), - migrations.AddField( - model_name='historicaloperation', - name='main_geodata', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData'), - ), - migrations.AddField( - model_name='operation', - name='geodata', - field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_operations_operation', to='ishtar_common.GeoVectorData'), - ), - migrations.AddField( - model_name='operation', - name='main_geodata', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_operations_operation', to='ishtar_common.GeoVectorData'), - ), - migrations.AlterField( - model_name='administrativeact', - name='act_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archaeological_operations.ActType', verbose_name='Act type'), - ), - migrations.AlterField( - model_name='administrativeact', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='administrativeact', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='administrativeact', - name='last_modified', - field=models.DateTimeField(), - ), - migrations.AlterField( - model_name='archaeologicalsite', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='archaeologicalsite', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='archaeologicalsite', - name='last_modified', - field=models.DateTimeField(), - ), - migrations.AlterField( - model_name='archaeologicalsite', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ishtar_common.SpatialReferenceSystem', verbose_name='Spatial Reference System'), - ), - migrations.AlterField( - model_name='historicaladministrativeact', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='historicaladministrativeact', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='historicaladministrativeact', - name='last_modified', - field=models.DateTimeField(), - ), - migrations.AlterField( - model_name='historicalarchaeologicalsite', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='historicalarchaeologicalsite', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='historicalarchaeologicalsite', - name='last_modified', - field=models.DateTimeField(), - ), - migrations.AlterField( - model_name='historicaloperation', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='historicaloperation', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='historicaloperation', - name='in_charge', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Operation monitor'), - ), - migrations.AlterField( - model_name='historicaloperation', - name='last_modified', - field=models.DateTimeField(), - ), - migrations.AlterField( - model_name='historicaloperation', - name='scientist', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Scientific manager'), - ), - migrations.AlterField( - model_name='operation', - name='applicant_authority', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operation_applicant_authority', to='ishtar_common.Organization', verbose_name='Applicant authority'), - ), - migrations.AlterField( - model_name='operation', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='operation', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='operation', - name='in_charge', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operation_monitoring', to='ishtar_common.Person', verbose_name='Operation monitor'), - ), - migrations.AlterField( - model_name='operation', - name='last_modified', - field=models.DateTimeField(), - ), - migrations.AlterField( - model_name='operation', - name='minutes_writer', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='minutes_writer', to='ishtar_common.Person', verbose_name='Writer of the minutes'), - ), - migrations.AlterField( - model_name='operation', - name='operation_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='ishtar_common.OperationType', verbose_name='Operation type'), - ), - migrations.AlterField( - model_name='operation', - name='protagonist', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operation_protagonist', to='ishtar_common.Person', verbose_name='Name of the protagonist'), - ), - migrations.AlterField( - model_name='operation', - name='scientist', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operation_scientist_responsability', to='ishtar_common.Person', verbose_name='Scientific manager'), - ), - migrations.AlterField( - model_name='operation', - name='spatial_reference_system', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ishtar_common.SpatialReferenceSystem', verbose_name='Spatial Reference System'), - ), - migrations.AlterField( - model_name='parcel', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='parcel', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='parcel', - name='last_modified', - field=models.DateTimeField(), - ), - migrations.AlterField( - model_name='parcel', - name='town', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='parcels', to='ishtar_common.Town', verbose_name='Town'), - ), - migrations.AlterField( - model_name='parcelowner', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='parcelowner', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), - ), - migrations.AlterField( - model_name='parcelowner', - name='last_modified', - field=models.DateTimeField(), - ), - migrations.AlterField( - model_name='parcelowner', - name='owner', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='parcel_owner', to='ishtar_common.Person', verbose_name='Owner'), - ), - migrations.AlterField( - model_name='recordrelations', - name='relation_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archaeological_operations.RelationType'), - ), - migrations.AlterField( - model_name='relationtype', - name='inverse_relation', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_operations.RelationType', verbose_name='Inverse relation'), - ), - ] diff --git a/archaeological_operations/migrations/0109_auto_20220711_1025.py b/archaeological_operations/migrations/0109_auto_20220711_1025.py new file mode 100644 index 000000000..4592be2be --- /dev/null +++ b/archaeological_operations/migrations/0109_auto_20220711_1025.py @@ -0,0 +1,256 @@ +# Generated by Django 2.2.24 on 2022-07-11 10:25 + +import datetime +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0220_auto_20220707_1633'), + ('archaeological_operations', '0108_auto_20220711_0112'), + ] + + operations = [ + migrations.AlterModelOptions( + name='parcel', + options={'ordering': ('town', 'year', 'section', 'parcel_number'), 'verbose_name': 'Parcel', 'verbose_name_plural': 'Parcels'}, + ), + migrations.AddField( + model_name='archaeologicalsite', + name='geodata', + field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_operations_archaeologicalsite', to='ishtar_common.GeoVectorData'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='main_geodata', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_operations_archaeologicalsite', to='ishtar_common.GeoVectorData'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='main_geodata', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData'), + ), + migrations.AddField( + model_name='historicaloperation', + name='main_geodata', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.GeoVectorData'), + ), + migrations.AddField( + model_name='operation', + name='geodata', + field=models.ManyToManyField(blank=True, related_name='related_items_archaeological_operations_operation', to='ishtar_common.GeoVectorData'), + ), + migrations.AddField( + model_name='operation', + name='main_geodata', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='main_related_items_archaeological_operations_operation', to='ishtar_common.GeoVectorData'), + ), + migrations.AlterField( + model_name='administrativeact', + name='act_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archaeological_operations.ActType', verbose_name='Act type'), + ), + migrations.AlterField( + model_name='administrativeact', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='administrativeact', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='administrativeact', + name='in_charge', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='adminact_operation_in_charge', to='ishtar_common.Person', verbose_name='Scientific monitor'), + ), + migrations.AlterField( + model_name='administrativeact', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='archaeologicalsite', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='archaeologicalsite', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='archaeologicalsite', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='archaeologicalsite', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ishtar_common.SpatialReferenceSystem', verbose_name='Spatial Reference System'), + ), + migrations.AlterField( + model_name='historicaladministrativeact', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='historicaladministrativeact', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='historicaladministrativeact', + name='in_charge', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Scientific monitor'), + ), + migrations.AlterField( + model_name='historicaladministrativeact', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicalarchaeologicalsite', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='historicalarchaeologicalsite', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='historicalarchaeologicalsite', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicaloperation', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='historicaloperation', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='historicaloperation', + name='in_charge', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Operation monitor'), + ), + migrations.AlterField( + model_name='historicaloperation', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicaloperation', + name='scientist', + field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Scientific manager'), + ), + migrations.AlterField( + model_name='operation', + name='applicant_authority', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operation_applicant_authority', to='ishtar_common.Organization', verbose_name='Applicant authority'), + ), + migrations.AlterField( + model_name='operation', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='operation', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='operation', + name='in_charge', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operation_monitoring', to='ishtar_common.Person', verbose_name='Operation monitor'), + ), + migrations.AlterField( + model_name='operation', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='operation', + name='minutes_writer', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='minutes_writer', to='ishtar_common.Person', verbose_name='Writer of the minutes'), + ), + migrations.AlterField( + model_name='operation', + name='operation_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='ishtar_common.OperationType', verbose_name='Operation type'), + ), + migrations.AlterField( + model_name='operation', + name='protagonist', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operation_protagonist', to='ishtar_common.Person', verbose_name='Name of the protagonist'), + ), + migrations.AlterField( + model_name='operation', + name='scientist', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='operation_scientist_responsability', to='ishtar_common.Person', verbose_name='Scientific manager'), + ), + migrations.AlterField( + model_name='operation', + name='spatial_reference_system', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='ishtar_common.SpatialReferenceSystem', verbose_name='Spatial Reference System'), + ), + migrations.AlterField( + model_name='parcel', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='parcel', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='parcel', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='parcel', + name='town', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='parcels', to='ishtar_common.Town', verbose_name='Town'), + ), + migrations.AlterField( + model_name='parcelowner', + name='data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='parcelowner', + name='history_m2m', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default=dict), + ), + migrations.AlterField( + model_name='parcelowner', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='parcelowner', + name='owner', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='parcel_owner', to='ishtar_common.Person', verbose_name='Owner'), + ), + migrations.AlterField( + model_name='recordrelations', + name='relation_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='archaeological_operations.RelationType'), + ), + migrations.AlterField( + model_name='relationtype', + name='inverse_relation', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_operations.RelationType', verbose_name='Inverse relation'), + ), + ] diff --git a/archaeological_operations/migrations/0110_auto_20220707_1633.py b/archaeological_operations/migrations/0110_auto_20220707_1633.py deleted file mode 100644 index 71e623e02..000000000 --- a/archaeological_operations/migrations/0110_auto_20220707_1633.py +++ /dev/null @@ -1,65 +0,0 @@ -# Generated by Django 2.2.24 on 2022-07-07 16:33 - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0109_auto_20220328_1222'), - ] - - operations = [ - migrations.AlterField( - model_name='administrativeact', - name='in_charge', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='adminact_operation_in_charge', to='ishtar_common.Person', verbose_name='Scientific monitor'), - ), - migrations.AlterField( - model_name='administrativeact', - name='last_modified', - field=models.DateTimeField(blank=True, default=datetime.datetime.now), - ), - migrations.AlterField( - model_name='archaeologicalsite', - name='last_modified', - field=models.DateTimeField(blank=True, default=datetime.datetime.now), - ), - migrations.AlterField( - model_name='historicaladministrativeact', - name='in_charge', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='ishtar_common.Person', verbose_name='Scientific monitor'), - ), - migrations.AlterField( - model_name='historicaladministrativeact', - name='last_modified', - field=models.DateTimeField(blank=True, default=datetime.datetime.now), - ), - migrations.AlterField( - model_name='historicalarchaeologicalsite', - name='last_modified', - field=models.DateTimeField(blank=True, default=datetime.datetime.now), - ), - migrations.AlterField( - model_name='historicaloperation', - name='last_modified', - field=models.DateTimeField(blank=True, default=datetime.datetime.now), - ), - migrations.AlterField( - model_name='operation', - name='last_modified', - field=models.DateTimeField(blank=True, default=datetime.datetime.now), - ), - migrations.AlterField( - model_name='parcel', - name='last_modified', - field=models.DateTimeField(blank=True, default=datetime.datetime.now), - ), - migrations.AlterField( - model_name='parcelowner', - name='last_modified', - field=models.DateTimeField(blank=True, default=datetime.datetime.now), - ), - ] -- cgit v1.2.3