From 60fa8eae45f6c1ac8ca263c4c2cdda34d3757973 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 6 Feb 2019 16:17:58 +0100 Subject: Merge migrations --- .../migrations/0059_auto_20190204_1134.py | 32 -------------------- .../migrations/0060_auto_20190206_1423.py | 35 ---------------------- .../migrations/0061_auto_20190204_1134.py | 32 ++++++++++++++++++++ .../migrations/0062_auto_20190206_1423.py | 35 ++++++++++++++++++++++ 4 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 archaeological_finds/migrations/0059_auto_20190204_1134.py delete mode 100644 archaeological_finds/migrations/0060_auto_20190206_1423.py create mode 100644 archaeological_finds/migrations/0061_auto_20190204_1134.py create mode 100644 archaeological_finds/migrations/0062_auto_20190206_1423.py (limited to 'archaeological_finds') diff --git a/archaeological_finds/migrations/0059_auto_20190204_1134.py b/archaeological_finds/migrations/0059_auto_20190204_1134.py deleted file mode 100644 index b2a96097a..000000000 --- a/archaeological_finds/migrations/0059_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', '0058_views_find_nonmodif_treatments'), - ] - - 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/0060_auto_20190206_1423.py b/archaeological_finds/migrations/0060_auto_20190206_1423.py deleted file mode 100644 index 6ddfa5145..000000000 --- a/archaeological_finds/migrations/0060_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', '0059_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/0061_auto_20190204_1134.py b/archaeological_finds/migrations/0061_auto_20190204_1134.py new file mode 100644 index 000000000..bc719b24c --- /dev/null +++ b/archaeological_finds/migrations/0061_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', '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_20190206_1423.py b/archaeological_finds/migrations/0062_auto_20190206_1423.py new file mode 100644 index 000000000..8f4a26cec --- /dev/null +++ b/archaeological_finds/migrations/0062_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', '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'), + ), + ] -- cgit v1.2.3