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/0104_auto_20201104_0959.py | 39 ------------- .../migrations/0104_auto_20201201_1533.py | 64 ++++++++++++++++++++++ .../migrations/0105_auto_20201117_0759.py | 35 ------------ 3 files changed, 64 insertions(+), 74 deletions(-) delete mode 100644 archaeological_operations/migrations/0104_auto_20201104_0959.py create mode 100644 archaeological_operations/migrations/0104_auto_20201201_1533.py delete mode 100644 archaeological_operations/migrations/0105_auto_20201117_0759.py (limited to 'archaeological_operations/migrations') diff --git a/archaeological_operations/migrations/0104_auto_20201104_0959.py b/archaeological_operations/migrations/0104_auto_20201104_0959.py deleted file mode 100644 index 356f5855c..000000000 --- a/archaeological_operations/migrations/0104_auto_20201104_0959.py +++ /dev/null @@ -1,39 +0,0 @@ -# -*- 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_operations/migrations/0104_auto_20201201_1533.py b/archaeological_operations/migrations/0104_auto_20201201_1533.py new file mode 100644 index 000000000..ecebaca24 --- /dev/null +++ b/archaeological_operations/migrations/0104_auto_20201201_1533.py @@ -0,0 +1,64 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-12-01 15:33 +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='archaeologicalsite', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicalarchaeologicalsite', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='historicaloperation', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicaloperation', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='operation', + name='complete_identifier', + field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='operation', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AlterField( + model_name='relationtype', + name='logical_relation', + field=models.CharField(blank=True, choices=[('above', 'Above'), ('below', 'Below'), ('equal', 'Equal'), ('include', 'Include'), ('included', 'Is included')], max_length=10, null=True, verbose_name='Logical relation'), + ), + ] diff --git a/archaeological_operations/migrations/0105_auto_20201117_0759.py b/archaeological_operations/migrations/0105_auto_20201117_0759.py deleted file mode 100644 index 7514368e5..000000000 --- a/archaeological_operations/migrations/0105_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_operations', '0104_auto_20201104_0959'), - ] - - operations = [ - migrations.AddField( - model_name='archaeologicalsite', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicalarchaeologicalsite', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicaloperation', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='operation', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - ] -- cgit v1.2.3