From 342ea7e679a1609a810f216549e403d2563d27a1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 1 Dec 2020 15:46:18 +0100 Subject: Migration squash --- .../migrations/0106_auto_20201104_1000.py | 46 --------------- .../migrations/0106_auto_20201201_1534.py | 66 ++++++++++++++++++++++ .../migrations/0107_auto_20201117_0759.py | 35 ------------ 3 files changed, 66 insertions(+), 81 deletions(-) delete mode 100644 archaeological_finds/migrations/0106_auto_20201104_1000.py create mode 100644 archaeological_finds/migrations/0106_auto_20201201_1534.py delete mode 100644 archaeological_finds/migrations/0107_auto_20201117_0759.py (limited to 'archaeological_finds') diff --git a/archaeological_finds/migrations/0106_auto_20201104_1000.py b/archaeological_finds/migrations/0106_auto_20201104_1000.py deleted file mode 100644 index 60fee9e8b..000000000 --- a/archaeological_finds/migrations/0106_auto_20201104_1000.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- 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_finds/migrations/0106_auto_20201201_1534.py b/archaeological_finds/migrations/0106_auto_20201201_1534.py new file mode 100644 index 000000000..a504a1a82 --- /dev/null +++ b/archaeological_finds/migrations/0106_auto_20201201_1534.py @@ -0,0 +1,66 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-12-01 15:34 +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='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + 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='find', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + 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='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + 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'), + ), + migrations.AddField( + model_name='historicalfind', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + ] diff --git a/archaeological_finds/migrations/0107_auto_20201117_0759.py b/archaeological_finds/migrations/0107_auto_20201117_0759.py deleted file mode 100644 index c451c601a..000000000 --- a/archaeological_finds/migrations/0107_auto_20201117_0759.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.27 on 2020-11-17 07:59 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_finds', '0106_auto_20201104_1000'), - ] - - operations = [ - migrations.AddField( - model_name='basefind', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='find', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicalfind', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - ] -- cgit v1.2.3