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 --- 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 +++++++++++++++++++++ 4 files changed, 55 insertions(+), 60 deletions(-) delete mode 100644 archaeological_files/migrations/0107_auto_20220328_1222.py create mode 100644 archaeological_files/migrations/0108_auto_20220707_1633.py (limited to 'archaeological_files') 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'), + ), + ] -- cgit v1.2.3