From a80d3fc9e5303558419e9c97ccd335a0ac46fbe1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 7 Jul 2022 16:37:55 +0200 Subject: Fix migrations and imports --- .../migrations/0108_auto_20220707_1633.py | 24 ++++++++ archaeological_files/admin.py | 1 + .../migrations/0106_auto_20210803_1730.py | 5 -- .../migrations/0107_auto_20220328_1222.py | 55 ------------------ .../migrations/0108_auto_20220707_1633.py | 54 ++++++++++++++++++ .../migrations/0110_auto_20220707_1633.py | 59 ++++++++++++++++++++ .../migrations/0110_auto_20220707_1633.py | 65 ++++++++++++++++++++++ archaeological_operations/tests.py | 2 + .../migrations/0114_auto_20220707_1633.py | 29 ++++++++++ .../migrations/0220_auto_20220707_1633.py | 64 +++++++++++++++++++++ 10 files changed, 298 insertions(+), 60 deletions(-) create mode 100644 archaeological_context_records/migrations/0108_auto_20220707_1633.py delete mode 100644 archaeological_files/migrations/0107_auto_20220328_1222.py create mode 100644 archaeological_files/migrations/0108_auto_20220707_1633.py create mode 100644 archaeological_finds/migrations/0110_auto_20220707_1633.py create mode 100644 archaeological_operations/migrations/0110_auto_20220707_1633.py create mode 100644 archaeological_warehouse/migrations/0114_auto_20220707_1633.py create mode 100644 ishtar_common/migrations/0220_auto_20220707_1633.py diff --git a/archaeological_context_records/migrations/0108_auto_20220707_1633.py b/archaeological_context_records/migrations/0108_auto_20220707_1633.py new file mode 100644 index 000000000..cd634f5b8 --- /dev/null +++ b/archaeological_context_records/migrations/0108_auto_20220707_1633.py @@ -0,0 +1,24 @@ +# Generated by Django 2.2.24 on 2022-07-07 16:33 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0107_auto_20220328_1222'), + ] + + operations = [ + migrations.AlterField( + model_name='contextrecord', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicalcontextrecord', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + ] diff --git a/archaeological_files/admin.py b/archaeological_files/admin.py index 903e90568..4f3bc5333 100644 --- a/archaeological_files/admin.py +++ b/archaeological_files/admin.py @@ -17,6 +17,7 @@ # See the file COPYING for details. +from django import forms from django.conf import settings from django.conf.urls import url from django.http import HttpResponseRedirect diff --git a/archaeological_files/migrations/0106_auto_20210803_1730.py b/archaeological_files/migrations/0106_auto_20210803_1730.py index ac635e59f..532d6880c 100644 --- a/archaeological_files/migrations/0106_auto_20210803_1730.py +++ b/archaeological_files/migrations/0106_auto_20210803_1730.py @@ -298,9 +298,4 @@ class Migration(migrations.Migration): name='type_of_agreement', field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='archaeological_files.AgreementType', verbose_name='Type of agreement'), ), - migrations.AddField( - model_name='equipmentservicecost', - name='parent', - field=models.ForeignKey(blank=True, help_text='Auto-add this cost when a parent is added', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='archaeological_files.EquipmentServiceType', verbose_name='Parent'), - ), ] diff --git a/archaeological_files/migrations/0107_auto_20220328_1222.py b/archaeological_files/migrations/0107_auto_20220328_1222.py deleted file mode 100644 index 62f7551eb..000000000 --- a/archaeological_files/migrations/0107_auto_20220328_1222.py +++ /dev/null @@ -1,55 +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 = [ - ('archaeological_files', '0106_auto_20210803_1730'), - ] - - 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='file', - name='last_modified', - field=models.DateTimeField(), - ), - 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='historicalfile', - name='last_modified', - field=models.DateTimeField(), - ), - 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/0108_auto_20220707_1633.py b/archaeological_files/migrations/0108_auto_20220707_1633.py new file mode 100644 index 000000000..fe50e8fed --- /dev/null +++ b/archaeological_files/migrations/0108_auto_20220707_1633.py @@ -0,0 +1,54 @@ +# 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_finds/migrations/0110_auto_20220707_1633.py b/archaeological_finds/migrations/0110_auto_20220707_1633.py new file mode 100644 index 000000000..f93b5bc4e --- /dev/null +++ b/archaeological_finds/migrations/0110_auto_20220707_1633.py @@ -0,0 +1,59 @@ +# Generated by Django 2.2.24 on 2022-07-07 16:33 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0109_auto_20220328_1222'), + ] + + operations = [ + migrations.AlterField( + model_name='basefind', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='find', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicalfind', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicaltreatment', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicaltreatmentfile', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='property', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='treatment', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='treatmentfile', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + ] diff --git a/archaeological_operations/migrations/0110_auto_20220707_1633.py b/archaeological_operations/migrations/0110_auto_20220707_1633.py new file mode 100644 index 000000000..71e623e02 --- /dev/null +++ b/archaeological_operations/migrations/0110_auto_20220707_1633.py @@ -0,0 +1,65 @@ +# 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), + ), + ] diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index 7e8442197..2521651ae 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -63,6 +63,8 @@ from ishtar_common.models import ( IshtarUser, TargetKey, ImporterModel, + ImporterDefault, + ImporterDefaultValues, IshtarSiteProfile, Town, ImporterColumn, diff --git a/archaeological_warehouse/migrations/0114_auto_20220707_1633.py b/archaeological_warehouse/migrations/0114_auto_20220707_1633.py new file mode 100644 index 000000000..7c0a297e4 --- /dev/null +++ b/archaeological_warehouse/migrations/0114_auto_20220707_1633.py @@ -0,0 +1,29 @@ +# Generated by Django 2.2.24 on 2022-07-07 16:33 + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_warehouse', '0113_auto_20220328_1222'), + ] + + operations = [ + migrations.AlterField( + model_name='container', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='warehouse', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + ] diff --git a/ishtar_common/migrations/0220_auto_20220707_1633.py b/ishtar_common/migrations/0220_auto_20220707_1633.py new file mode 100644 index 000000000..600adc6a1 --- /dev/null +++ b/ishtar_common/migrations/0220_auto_20220707_1633.py @@ -0,0 +1,64 @@ +# 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 = [ + ('ishtar_common', '0219_auto_20220407_1952'), + ] + + operations = [ + migrations.AlterModelOptions( + name='geovectordata', + options={'permissions': (('view_own_geovectordata', 'Can view own Geographic - Vector data'), ('add_own_geovectordata', 'Can add own Geographic - Vector data'), ('change_own_geovectordata', 'Can change own Geographic - Vector data'), ('delete_own_geovectordata', 'Can delete own Geographic - Vector data')), 'verbose_name': 'Geographic - Vector data', 'verbose_name_plural': 'Geographic - Vector data'}, + ), + migrations.AlterField( + model_name='document', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='geovectordata', + name='data_type', + field=models.ForeignKey(blank=True, help_text='For instance: outline, z-sup, ...', null=True, on_delete=django.db.models.deletion.PROTECT, to='ishtar_common.GeoDataType', verbose_name='Data type'), + ), + migrations.AlterField( + model_name='geovectordata', + name='name', + field=models.TextField(default='-', verbose_name='Name'), + ), + migrations.AlterField( + model_name='geovectordata', + name='origin', + field=models.ForeignKey(blank=True, help_text='For instance: topographical surveys, georeferencing, ...', null=True, on_delete=django.db.models.deletion.PROTECT, to='ishtar_common.GeoOriginType', verbose_name='Origin'), + ), + migrations.AlterField( + model_name='geovectordata', + name='provider', + field=models.ForeignKey(blank=True, help_text='Data provider', null=True, on_delete=django.db.models.deletion.PROTECT, to='ishtar_common.GeoProviderType', verbose_name='Provider'), + ), + migrations.AlterField( + model_name='historicalorganization', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='historicalperson', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='organization', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + migrations.AlterField( + model_name='person', + name='last_modified', + field=models.DateTimeField(blank=True, default=datetime.datetime.now), + ), + ] -- cgit v1.2.3