From ddccc8af774abd592a38aa5ed70975a1168720c5 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/0205_auto_20201007_1215.py | 101 --------------------- .../migrations/0205_auto_20201104_0959.py | 65 +++++++++++++ ishtar_common/models_common.py | 3 +- 3 files changed, 67 insertions(+), 102 deletions(-) delete mode 100644 ishtar_common/migrations/0205_auto_20201007_1215.py create mode 100644 ishtar_common/migrations/0205_auto_20201104_0959.py (limited to 'ishtar_common') 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