From 3d2a1569794c0e08cdbf1cbf0378617100ce8391 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 13 Feb 2019 22:43:55 +0100 Subject: Update migrations --- .../migrations/0041_auto_20190122_1550.py | 2 +- .../migrations/0061_auto_20190204_1134.py | 32 -------------------- .../migrations/0062_auto_20190204_1134.py | 32 ++++++++++++++++++++ .../migrations/0062_auto_20190206_1423.py | 35 ---------------------- .../migrations/0063_auto_20190206_1423.py | 35 ++++++++++++++++++++++ .../migrations/0049_auto_20190122_1550.py | 2 +- .../migrations/0085_document_index_ext_id.py | 1 + .../0085_ishtarsiteprofile_use_town_for_geo.py | 20 ------------- .../migrations/0086_auto_20190204_1149.py | 26 ---------------- .../0086_ishtarsiteprofile_use_town_for_geo.py | 20 +++++++++++++ .../migrations/0087_auto_20190204_1149.py | 26 ++++++++++++++++ 11 files changed, 116 insertions(+), 115 deletions(-) delete mode 100644 archaeological_finds/migrations/0061_auto_20190204_1134.py create mode 100644 archaeological_finds/migrations/0062_auto_20190204_1134.py delete mode 100644 archaeological_finds/migrations/0062_auto_20190206_1423.py create mode 100644 archaeological_finds/migrations/0063_auto_20190206_1423.py delete mode 100644 ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py delete mode 100644 ishtar_common/migrations/0086_auto_20190204_1149.py create mode 100644 ishtar_common/migrations/0086_ishtarsiteprofile_use_town_for_geo.py create mode 100644 ishtar_common/migrations/0087_auto_20190204_1149.py diff --git a/archaeological_context_records/migrations/0041_auto_20190122_1550.py b/archaeological_context_records/migrations/0041_auto_20190122_1550.py index 5931083eb..e3936cad8 100644 --- a/archaeological_context_records/migrations/0041_auto_20190122_1550.py +++ b/archaeological_context_records/migrations/0041_auto_20190122_1550.py @@ -9,7 +9,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'), + ('ishtar_common', '0086_ishtarsiteprofile_use_town_for_geo'), ('archaeological_context_records', '0040_auto_20190206_1522'), ] diff --git a/archaeological_finds/migrations/0061_auto_20190204_1134.py b/archaeological_finds/migrations/0061_auto_20190204_1134.py deleted file mode 100644 index bc719b24c..000000000 --- a/archaeological_finds/migrations/0061_auto_20190204_1134.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-04 11:34 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_finds', '0060_auto_20190206_1522'), - ] - - operations = [ - migrations.CreateModel( - name='FindNonModifTreatments', - fields=[ - ('treatment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='archaeological_finds.Treatment', verbose_name='Traitement')), - ('treatment_nb', models.IntegerField(verbose_name='Ordre')), - ], - options={ - 'ordering': ('find', '-treatment_nb'), - 'db_table': 'find_nonmodif_treatments', - 'managed': False, - }, - ), - migrations.AlterModelOptions( - name='treatment', - options={'ordering': ('-year', '-index', '-start_date'), 'permissions': (('view_treatment', 'Can view all Treatments'), ('view_own_treatment', 'Can view own Treatment'), ('add_own_treatment', 'Can add own Treatment'), ('change_own_treatment', 'Can change own Treatment'), ('delete_own_treatment', 'Can delete own Treatment')), 'verbose_name': 'Traitement', 'verbose_name_plural': 'Traitements'}, - ), - ] diff --git a/archaeological_finds/migrations/0062_auto_20190204_1134.py b/archaeological_finds/migrations/0062_auto_20190204_1134.py new file mode 100644 index 000000000..419de0437 --- /dev/null +++ b/archaeological_finds/migrations/0062_auto_20190204_1134.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-04 11:34 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0061_auto_20190213_1651'), + ] + + operations = [ + migrations.CreateModel( + name='FindNonModifTreatments', + fields=[ + ('treatment', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='archaeological_finds.Treatment', verbose_name='Traitement')), + ('treatment_nb', models.IntegerField(verbose_name='Ordre')), + ], + options={ + 'ordering': ('find', '-treatment_nb'), + 'db_table': 'find_nonmodif_treatments', + 'managed': False, + }, + ), + migrations.AlterModelOptions( + name='treatment', + options={'ordering': ('-year', '-index', '-start_date'), 'permissions': (('view_treatment', 'Can view all Treatments'), ('view_own_treatment', 'Can view own Treatment'), ('add_own_treatment', 'Can add own Treatment'), ('change_own_treatment', 'Can change own Treatment'), ('delete_own_treatment', 'Can delete own Treatment')), 'verbose_name': 'Traitement', 'verbose_name_plural': 'Traitements'}, + ), + ] diff --git a/archaeological_finds/migrations/0062_auto_20190206_1423.py b/archaeological_finds/migrations/0062_auto_20190206_1423.py deleted file mode 100644 index 8f4a26cec..000000000 --- a/archaeological_finds/migrations/0062_auto_20190206_1423.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-06 14:23 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_finds', '0061_auto_20190204_1134'), - ] - - operations = [ - migrations.AddField( - model_name='basefind', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='basefind', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='multi_polygon_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), - ), - migrations.AddField( - model_name='historicalbasefind', - name='point_source', - field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), - ), - ] diff --git a/archaeological_finds/migrations/0063_auto_20190206_1423.py b/archaeological_finds/migrations/0063_auto_20190206_1423.py new file mode 100644 index 000000000..5ed3eb49c --- /dev/null +++ b/archaeological_finds/migrations/0063_auto_20190206_1423.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-06 14:23 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0062_auto_20190204_1134'), + ] + + operations = [ + migrations.AddField( + model_name='basefind', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='basefind', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='multi_polygon_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Multi-polygon source'), + ), + migrations.AddField( + model_name='historicalbasefind', + name='point_source', + field=models.CharField(blank=True, choices=[(b'T', 'Commune'), (b'P', 'Precise')], max_length=1, null=True, verbose_name='Point source'), + ), + ] diff --git a/archaeological_operations/migrations/0049_auto_20190122_1550.py b/archaeological_operations/migrations/0049_auto_20190122_1550.py index b85df18f2..56f7ff429 100644 --- a/archaeological_operations/migrations/0049_auto_20190122_1550.py +++ b/archaeological_operations/migrations/0049_auto_20190122_1550.py @@ -10,7 +10,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'), + ('ishtar_common', '0086_ishtarsiteprofile_use_town_for_geo'), ('archaeological_operations', '0048_auto_20190206_1522'), ] diff --git a/ishtar_common/migrations/0085_document_index_ext_id.py b/ishtar_common/migrations/0085_document_index_ext_id.py index 1966a5cf9..62bc89d16 100644 --- a/ishtar_common/migrations/0085_document_index_ext_id.py +++ b/ishtar_common/migrations/0085_document_index_ext_id.py @@ -8,6 +8,7 @@ from django.db import migrations def gen_index(apps, schema_editor): from ishtar_common.models import Document + return q = Document.objects ln = q.count() if ln: diff --git a/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py b/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py deleted file mode 100644 index 8180ffa15..000000000 --- a/ishtar_common/migrations/0085_ishtarsiteprofile_use_town_for_geo.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-22 15:44 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0084_auto_20190206_1522'), - ] - - operations = [ - migrations.AddField( - model_name='ishtarsiteprofile', - name='use_town_for_geo', - field=models.BooleanField(default=True, verbose_name='Use town to locate when coordinates are missing'), - ), - ] diff --git a/ishtar_common/migrations/0086_auto_20190204_1149.py b/ishtar_common/migrations/0086_auto_20190204_1149.py deleted file mode 100644 index 0796aa34a..000000000 --- a/ishtar_common/migrations/0086_auto_20190204_1149.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-04 11:49 -from __future__ import unicode_literals - -import django.contrib.gis.db.models.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0085_ishtarsiteprofile_use_town_for_geo'), - ] - - operations = [ - migrations.AddField( - model_name='ishtarsiteprofile', - name='default_center', - field=django.contrib.gis.db.models.fields.PointField(default=b'SRID=4326;POINT(2.4397 46.5528)', srid=4326, verbose_name='Maps - default center'), - ), - migrations.AddField( - model_name='ishtarsiteprofile', - name='default_zoom', - field=models.IntegerField(default=6, verbose_name='Maps - default zoom'), - ), - ] diff --git a/ishtar_common/migrations/0086_ishtarsiteprofile_use_town_for_geo.py b/ishtar_common/migrations/0086_ishtarsiteprofile_use_town_for_geo.py new file mode 100644 index 000000000..9feede95b --- /dev/null +++ b/ishtar_common/migrations/0086_ishtarsiteprofile_use_town_for_geo.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-01-22 15:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0085_document_index_ext_id'), + ] + + operations = [ + migrations.AddField( + model_name='ishtarsiteprofile', + name='use_town_for_geo', + field=models.BooleanField(default=True, verbose_name='Use town to locate when coordinates are missing'), + ), + ] diff --git a/ishtar_common/migrations/0087_auto_20190204_1149.py b/ishtar_common/migrations/0087_auto_20190204_1149.py new file mode 100644 index 000000000..5f6245454 --- /dev/null +++ b/ishtar_common/migrations/0087_auto_20190204_1149.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2019-02-04 11:49 +from __future__ import unicode_literals + +import django.contrib.gis.db.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0086_ishtarsiteprofile_use_town_for_geo'), + ] + + operations = [ + migrations.AddField( + model_name='ishtarsiteprofile', + name='default_center', + field=django.contrib.gis.db.models.fields.PointField(default=b'SRID=4326;POINT(2.4397 46.5528)', srid=4326, verbose_name='Maps - default center'), + ), + migrations.AddField( + model_name='ishtarsiteprofile', + name='default_zoom', + field=models.IntegerField(default=6, verbose_name='Maps - default zoom'), + ), + ] -- cgit v1.2.3