From 7848a635ae487be3175714b86e0647da0043d828 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 4 Nov 2020 10:36:26 +0100 Subject: Fix migrations for complete_identifier --- .../migrations/0104_auto_20201007_1215.py | 25 ----- .../migrations/0104_auto_20201104_0959.py | 25 +++++ .../migrations/0103_auto_20201007_1215.py | 36 -------- .../migrations/0103_auto_20201104_1000.py | 36 ++++++++ .../migrations/0106_auto_20201007_1215.py | 46 ---------- .../migrations/0106_auto_20201104_1000.py | 46 ++++++++++ .../migrations/0104_auto_20201007_1215.py | 39 -------- .../migrations/0104_auto_20201104_0959.py | 39 ++++++++ .../migrations/0105_auto_20201007_1215.py | 30 ------ .../migrations/0105_auto_20201104_1000.py | 30 ++++++ .../migrations/0205_auto_20201007_1215.py | 101 --------------------- .../migrations/0205_auto_20201104_0959.py | 65 +++++++++++++ ishtar_common/models_common.py | 3 +- 13 files changed, 243 insertions(+), 278 deletions(-) delete mode 100644 archaeological_context_records/migrations/0104_auto_20201007_1215.py create mode 100644 archaeological_context_records/migrations/0104_auto_20201104_0959.py delete mode 100644 archaeological_files/migrations/0103_auto_20201007_1215.py create mode 100644 archaeological_files/migrations/0103_auto_20201104_1000.py delete mode 100644 archaeological_finds/migrations/0106_auto_20201007_1215.py create mode 100644 archaeological_finds/migrations/0106_auto_20201104_1000.py delete mode 100644 archaeological_operations/migrations/0104_auto_20201007_1215.py create mode 100644 archaeological_operations/migrations/0104_auto_20201104_0959.py delete mode 100644 archaeological_warehouse/migrations/0105_auto_20201007_1215.py create mode 100644 archaeological_warehouse/migrations/0105_auto_20201104_1000.py delete mode 100644 ishtar_common/migrations/0205_auto_20201007_1215.py create mode 100644 ishtar_common/migrations/0205_auto_20201104_0959.py diff --git a/archaeological_context_records/migrations/0104_auto_20201007_1215.py b/archaeological_context_records/migrations/0104_auto_20201007_1215.py deleted file mode 100644 index cb59f180c..000000000 --- a/archaeological_context_records/migrations/0104_auto_20201007_1215.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-10-07 12:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_context_records', '0103_historicalcontextrecord_history_change_reason'), - ] - - operations = [ - migrations.AddField( - model_name='contextrecord', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicalcontextrecord', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - ] diff --git a/archaeological_context_records/migrations/0104_auto_20201104_0959.py b/archaeological_context_records/migrations/0104_auto_20201104_0959.py new file mode 100644 index 000000000..3b13ec367 --- /dev/null +++ b/archaeological_context_records/migrations/0104_auto_20201104_0959.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-11-04 09:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0103_historicalcontextrecord_history_change_reason'), + ] + + operations = [ + migrations.AddField( + model_name='contextrecord', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicalcontextrecord', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + ] diff --git a/archaeological_files/migrations/0103_auto_20201007_1215.py b/archaeological_files/migrations/0103_auto_20201007_1215.py deleted file mode 100644 index d6f626fa9..000000000 --- a/archaeological_files/migrations/0103_auto_20201007_1215.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-10-07 12:15 -from __future__ import unicode_literals - -from django.db import migrations, models -import ishtar_common.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0102_historicalfile_history_change_reason'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='file', - name='qrcode', - field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.models.get_image_path), - ), - migrations.AddField( - model_name='historicalfile', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicalfile', - name='qrcode', - field=models.TextField(blank=True, max_length=255, null=True), - ), - ] diff --git a/archaeological_files/migrations/0103_auto_20201104_1000.py b/archaeological_files/migrations/0103_auto_20201104_1000.py new file mode 100644 index 000000000..566efa939 --- /dev/null +++ b/archaeological_files/migrations/0103_auto_20201104_1000.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-11-04 10:00 +from __future__ import unicode_literals + +from django.db import migrations, models +import ishtar_common.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_files', '0102_historicalfile_history_change_reason'), + ] + + operations = [ + migrations.AddField( + model_name='file', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='file', + name='qrcode', + field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), + ), + migrations.AddField( + model_name='historicalfile', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicalfile', + name='qrcode', + field=models.TextField(blank=True, max_length=255, null=True), + ), + ] diff --git a/archaeological_finds/migrations/0106_auto_20201007_1215.py b/archaeological_finds/migrations/0106_auto_20201007_1215.py deleted file mode 100644 index 842173d1e..000000000 --- a/archaeological_finds/migrations/0106_auto_20201007_1215.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-10-07 12:15 -from __future__ import unicode_literals - -from django.db import migrations, models -import ishtar_common.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_finds', '0105_auto_20200407_1414'), - ] - - operations = [ - migrations.AddField( - model_name='basefind', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='basefind', - name='qrcode', - field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.models.get_image_path), - ), - migrations.AddField( - model_name='find', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='qrcode', - field=models.TextField(blank=True, max_length=255, null=True), - ), - migrations.AddField( - model_name='historicalfind', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - ] diff --git a/archaeological_finds/migrations/0106_auto_20201104_1000.py b/archaeological_finds/migrations/0106_auto_20201104_1000.py new file mode 100644 index 000000000..60fee9e8b --- /dev/null +++ b/archaeological_finds/migrations/0106_auto_20201104_1000.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-11-04 10:00 +from __future__ import unicode_literals + +from django.db import migrations, models +import ishtar_common.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0105_auto_20200407_1414'), + ] + + operations = [ + migrations.AddField( + model_name='basefind', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='basefind', + name='qrcode', + field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path), + ), + migrations.AddField( + model_name='find', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='qrcode', + field=models.TextField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='historicalfind', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + ] diff --git a/archaeological_operations/migrations/0104_auto_20201007_1215.py b/archaeological_operations/migrations/0104_auto_20201007_1215.py deleted file mode 100644 index fa61cf836..000000000 --- a/archaeological_operations/migrations/0104_auto_20201007_1215.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-10-07 12:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_operations', '0103_auto_20200129_1941'), - ] - - operations = [ - migrations.AlterModelOptions( - name='recordrelations', - options={'ordering': ('left_record__cached_label', 'relation_type', 'right_record__cached_label'), 'permissions': [('view_operationrelation', 'Can view all Operation relations')], 'verbose_name': 'Operation record relation', 'verbose_name_plural': 'Operation record relations'}, - ), - migrations.AddField( - model_name='archaeologicalsite', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicaloperation', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='operation', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - ] diff --git a/archaeological_operations/migrations/0104_auto_20201104_0959.py b/archaeological_operations/migrations/0104_auto_20201104_0959.py new file mode 100644 index 000000000..356f5855c --- /dev/null +++ b/archaeological_operations/migrations/0104_auto_20201104_0959.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-11-04 09:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_operations', '0103_auto_20200129_1941'), + ] + + operations = [ + migrations.AlterModelOptions( + name='recordrelations', + options={'ordering': ('left_record__cached_label', 'relation_type', 'right_record__cached_label'), 'permissions': [('view_operationrelation', 'Can view all Operation relations')], 'verbose_name': 'Operation record relation', 'verbose_name_plural': 'Operation record relations'}, + ), + migrations.AddField( + model_name='archaeologicalsite', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicaloperation', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='operation', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + ] diff --git a/archaeological_warehouse/migrations/0105_auto_20201007_1215.py b/archaeological_warehouse/migrations/0105_auto_20201007_1215.py deleted file mode 100644 index 9d009bed1..000000000 --- a/archaeological_warehouse/migrations/0105_auto_20201007_1215.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-10-07 12:15 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_warehouse', '0104_auto_20200925_1024'), - ] - - operations = [ - migrations.AddField( - model_name='container', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='historicalwarehouse', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='warehouse', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - ] diff --git a/archaeological_warehouse/migrations/0105_auto_20201104_1000.py b/archaeological_warehouse/migrations/0105_auto_20201104_1000.py new file mode 100644 index 000000000..a01e39e1b --- /dev/null +++ b/archaeological_warehouse/migrations/0105_auto_20201104_1000.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-11-04 10:00 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_warehouse', '0104_auto_20200925_1024'), + ] + + operations = [ + migrations.AddField( + model_name='container', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicalwarehouse', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='warehouse', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + ] diff --git a/ishtar_common/migrations/0205_auto_20201007_1215.py b/ishtar_common/migrations/0205_auto_20201007_1215.py deleted file mode 100644 index 41a931843..000000000 --- a/ishtar_common/migrations/0205_auto_20201007_1215.py +++ /dev/null @@ -1,101 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-10-07 12:15 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0204_auto_20201007_1630'), - ] - - operations = [ - migrations.AddField( - model_name='document', - name='complete_identifier', - field=models.TextField(blank=True, verbose_name='Complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='basefind_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage base find complete identifier.', verbose_name='Base find complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='container_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage container complete identifier.', verbose_name='Container complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='context_record_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage context record complete identifier.', verbose_name='Context record complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='document_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage document complete identifier.', verbose_name='Document complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='file_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage archaeological file complete identifier.', verbose_name='Archaeological file complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='find_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage find complete identifier.', verbose_name='Find complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='operation_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage operation complete identifier.', verbose_name='Operation complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='site_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage archaeological site complete identifier.', verbose_name='Archaeological site complete identifier'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='warehouse_complete_identifier', - field=models.TextField(default='', help_text='Formula to manage warehouse complete identifier.', verbose_name='Warehouse complete identifier'), - ), - migrations.AlterField( - model_name='document', - name='format_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ishtar_common.Format', verbose_name='Medium'), - ), - migrations.AlterField( - model_name='document', - name='publisher', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='publish', to='ishtar_common.Organization', verbose_name='Publisher'), - ), - migrations.AlterField( - model_name='importercolumn', - name='regexp_pre_filter', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='columns', to='ishtar_common.Regexp'), - ), - migrations.AlterField( - model_name='importercolumn', - name='value_format', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='columns', to='ishtar_common.ValueFormater'), - ), - migrations.AlterField( - model_name='importertype', - name='associated_models', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='importer_type_associated', to='ishtar_common.ImporterModel', verbose_name='Associated model'), - ), - migrations.AlterField( - model_name='importertype', - name='created_models', - field=models.ManyToManyField(blank=True, help_text='Leave blank for no restrictions', related_name='importer_type_created', to='ishtar_common.ImporterModel', verbose_name='Models that can accept new items'), - ), - migrations.AlterField( - model_name='importtarget', - name='formater_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='targets', to='ishtar_common.FormaterType'), - ), - ] diff --git a/ishtar_common/migrations/0205_auto_20201104_0959.py b/ishtar_common/migrations/0205_auto_20201104_0959.py new file mode 100644 index 000000000..e6cb86081 --- /dev/null +++ b/ishtar_common/migrations/0205_auto_20201104_0959.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-11-04 09:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0204_auto_20201007_1630'), + ] + + operations = [ + migrations.AddField( + model_name='document', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='basefind_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage base find complete identifier.', verbose_name='Base find complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='container_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage container complete identifier.', verbose_name='Container complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='context_record_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage context record complete identifier.', verbose_name='Context record complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='document_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage document complete identifier.', verbose_name='Document complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='file_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage archaeological file complete identifier.', verbose_name='Archaeological file complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='find_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage find complete identifier.', verbose_name='Find complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='operation_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage operation complete identifier.', verbose_name='Operation complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='site_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage archaeological site complete identifier.', verbose_name='Archaeological site complete identifier'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='warehouse_complete_identifier', + field=models.TextField(default='', help_text='Formula to manage warehouse complete identifier.', verbose_name='Warehouse complete identifier'), + ), + ] diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 8c5d60637..98d435ce9 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -2643,7 +2643,8 @@ class ImageContainerModel: class CompleteIdentifierItem(models.Model, ImageContainerModel): HAS_QR_CODE = True - complete_identifier = models.TextField(_("Complete identifier"), blank=True) + complete_identifier = models.TextField(_("Complete identifier"), + blank=True, null=True) qrcode = models.ImageField(upload_to=get_image_path, blank=True, null=True, max_length=255) -- cgit v1.2.3