summaryrefslogtreecommitdiff
path: root/archaeological_warehouse
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-12-01 15:46:18 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-02-28 12:15:21 +0100
commit898711cbba90f11997e1ef6480999bef5c870e2d (patch)
treef3dbbde9ae3d2b4b93d3b60207d6229502e5bbee /archaeological_warehouse
parentbabba00f09b77972cc35fcea59b31d4615685ab7 (diff)
downloadIshtar-898711cbba90f11997e1ef6480999bef5c870e2d.tar.bz2
Ishtar-898711cbba90f11997e1ef6480999bef5c870e2d.zip
Migration squash
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r--archaeological_warehouse/migrations/0105_auto_20201201_1534.py (renamed from archaeological_warehouse/migrations/0105_auto_20201104_1000.py)17
-rw-r--r--archaeological_warehouse/migrations/0106_auto_20201117_0759.py30
2 files changed, 16 insertions, 31 deletions
diff --git a/archaeological_warehouse/migrations/0105_auto_20201104_1000.py b/archaeological_warehouse/migrations/0105_auto_20201201_1534.py
index a01e39e1b..57ca4b139 100644
--- a/archaeological_warehouse/migrations/0105_auto_20201104_1000.py
+++ b/archaeological_warehouse/migrations/0105_auto_20201201_1534.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-11-04 10:00
+# Generated by Django 1.11.27 on 2020-12-01 15:34
from __future__ import unicode_literals
from django.db import migrations, models
@@ -18,13 +18,28 @@ class Migration(migrations.Migration):
field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
+ model_name='container',
+ name='custom_index',
+ field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+ ),
+ migrations.AddField(
model_name='historicalwarehouse',
name='complete_identifier',
field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
+ model_name='historicalwarehouse',
+ name='custom_index',
+ field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+ ),
+ migrations.AddField(
model_name='warehouse',
name='complete_identifier',
field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
+ migrations.AddField(
+ model_name='warehouse',
+ name='custom_index',
+ field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
+ ),
]
diff --git a/archaeological_warehouse/migrations/0106_auto_20201117_0759.py b/archaeological_warehouse/migrations/0106_auto_20201117_0759.py
deleted file mode 100644
index 39a30b34c..000000000
--- a/archaeological_warehouse/migrations/0106_auto_20201117_0759.py
+++ /dev/null
@@ -1,30 +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_warehouse', '0105_auto_20201104_1000'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='container',
- name='custom_index',
- field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
- ),
- migrations.AddField(
- model_name='historicalwarehouse',
- name='custom_index',
- field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
- ),
- migrations.AddField(
- model_name='warehouse',
- name='custom_index',
- field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'),
- ),
- ]