diff options
| 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 |
| commit | 342ea7e679a1609a810f216549e403d2563d27a1 (patch) | |
| tree | f3dbbde9ae3d2b4b93d3b60207d6229502e5bbee /archaeological_files | |
| parent | 4b1795003d8bb5c1c3f5f33edf803529d99e6de8 (diff) | |
| download | Ishtar-342ea7e679a1609a810f216549e403d2563d27a1.tar.bz2 Ishtar-342ea7e679a1609a810f216549e403d2563d27a1.zip | |
Migration squash
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/migrations/0103_auto_20201201_1534.py (renamed from archaeological_files/migrations/0103_auto_20201104_1000.py) | 12 | ||||
| -rw-r--r-- | archaeological_files/migrations/0104_auto_20201117_0759.py | 25 |
2 files changed, 11 insertions, 26 deletions
diff --git a/archaeological_files/migrations/0103_auto_20201104_1000.py b/archaeological_files/migrations/0103_auto_20201201_1534.py index 566efa939..55e54d3be 100644 --- a/archaeological_files/migrations/0103_auto_20201104_1000.py +++ b/archaeological_files/migrations/0103_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 @@ -20,6 +20,11 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='file', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + 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), ), @@ -30,6 +35,11 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='historicalfile', + name='custom_index', + field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), + ), + migrations.AddField( + model_name='historicalfile', name='qrcode', field=models.TextField(blank=True, max_length=255, null=True), ), diff --git a/archaeological_files/migrations/0104_auto_20201117_0759.py b/archaeological_files/migrations/0104_auto_20201117_0759.py deleted file mode 100644 index 3bb881ef3..000000000 --- a/archaeological_files/migrations/0104_auto_20201117_0759.py +++ /dev/null @@ -1,25 +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_files', '0103_auto_20201104_1000'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - migrations.AddField( - model_name='historicalfile', - name='custom_index', - field=models.IntegerField(blank=True, null=True, verbose_name='Custom index'), - ), - ] |