diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-01-29 17:41:48 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-07-01 18:02:28 +0200 |
commit | 49e87a9cb4e32c30e004dbf87f1b8f4d8326282f (patch) | |
tree | cd63cc6c0ed2e4d907c0026ea00682067064912b /archaeological_files | |
parent | a3c9b4a707d80c6ba043c11703f8af46ccb6d16c (diff) | |
download | Ishtar-49e87a9cb4e32c30e004dbf87f1b8f4d8326282f.tar.bz2 Ishtar-49e87a9cb4e32c30e004dbf87f1b8f4d8326282f.zip |
Finish migration refactoring
Diffstat (limited to 'archaeological_files')
26 files changed, 6 insertions, 1760 deletions
diff --git a/archaeological_files/migrations/0001_initial.py b/archaeological_files/migrations/0001_initial.py deleted file mode 100644 index 878be3902..000000000 --- a/archaeological_files/migrations/0001_initial.py +++ /dev/null @@ -1,159 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -import datetime -import archaeological_operations.models -import ishtar_common.utils -import ishtar_common.models -import re -import django.core.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='FileByDepartment', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ], - options={ - 'db_table': 'file_department', - 'managed': False, - }, - ), - migrations.CreateModel( - name='File', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('year', models.IntegerField(default=ishtar_common.utils.get_current_year, verbose_name='Year')), - ('numeric_reference', models.IntegerField(null=True, verbose_name='Numeric reference', blank=True)), - ('internal_reference', models.CharField(max_length=60, null=True, verbose_name='Internal reference', blank=True)), - ('external_id', models.CharField(max_length=120, null=True, verbose_name='External ID', blank=True)), - ('auto_external_id', models.BooleanField(default=False, verbose_name='External ID is set automatically')), - ('name', models.TextField(null=True, verbose_name='Name', blank=True)), - ('raw_general_contractor', models.CharField(max_length=200, null=True, verbose_name='General contractor (raw)', blank=True)), - ('raw_town_planning_service', models.CharField(max_length=200, null=True, verbose_name='Planning service (raw)', blank=True)), - ('permit_reference', models.TextField(null=True, verbose_name='Permit reference', blank=True)), - ('end_date', models.DateField(null=True, verbose_name='Closing date', blank=True)), - ('creation_date', models.DateField(default=datetime.date.today, null=True, verbose_name='Creation date', blank=True)), - ('reception_date', models.DateField(null=True, verbose_name='Reception date', blank=True)), - ('instruction_deadline', models.DateField(null=True, verbose_name='Instruction deadline', blank=True)), - ('total_surface', models.FloatField(null=True, verbose_name='Total surface (m2)', blank=True)), - ('total_developed_surface', models.FloatField(null=True, verbose_name='Total developed surface (m2)', blank=True)), - ('locality', models.CharField(max_length=100, null=True, verbose_name='Locality', blank=True)), - ('address', models.TextField(null=True, verbose_name='Main address', blank=True)), - ('postal_code', models.CharField(max_length=10, null=True, verbose_name='Main address - postal code', blank=True)), - ('comment', models.TextField(null=True, verbose_name='Comment', blank=True)), - ('research_comment', models.TextField(null=True, verbose_name='Research archaeology comment', blank=True)), - ('classified_area', models.NullBooleanField(verbose_name='Classified area')), - ('protected_area', models.NullBooleanField(verbose_name='Protected area')), - ('cira_advised', models.NullBooleanField(verbose_name='Passage en CIRA')), - ('mh_register', models.NullBooleanField(verbose_name='Sur Monument Historique class\xe9')), - ('mh_listing', models.NullBooleanField(verbose_name='Sur Monument Historique inscrit')), - ('cached_label', models.TextField(null=True, verbose_name='Cached name', blank=True)), - ('imported_line', models.TextField(null=True, verbose_name='Imported line', blank=True)), - ], - options={ - 'ordering': ('cached_label',), - 'verbose_name': 'Archaeological file', - 'verbose_name_plural': 'Archaeological files', - 'permissions': (('view_file', 'Peut voir tous les Dossiers'), ('view_own_file', 'Peut voir son propre Dossier'), ('add_own_file', 'Peut ajouter son propre Dossier'), ('change_own_file', 'Peut modifier son propre Dossier'), ('delete_own_file', 'Peut supprimer son propre Dossier'), ('close_file', 'Peut clore un Dossier')), - }, - bases=(archaeological_operations.models.ClosedItem, models.Model, ishtar_common.models.OwnPerms, ishtar_common.models.ValueGetter, ishtar_common.models.ShortMenuItem, ishtar_common.models.DashboardFormItem), - ), - migrations.CreateModel( - name='FileType', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('label', models.CharField(max_length=100, verbose_name='Label')), - ('txt_idx', models.CharField(unique=True, max_length=100, verbose_name='Textual ID', validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+$'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')])), - ('comment', models.TextField(null=True, verbose_name='Comment', blank=True)), - ('available', models.BooleanField(default=True, verbose_name='Available')), - ], - options={ - 'ordering': ('label',), - 'verbose_name': 'Archaeological file type', - 'verbose_name_plural': 'Archaeological file types', - }, - bases=(ishtar_common.models.Cached, models.Model), - ), - migrations.CreateModel( - name='HistoricalFile', - fields=[ - ('id', models.IntegerField(verbose_name='ID', db_index=True, auto_created=True, blank=True)), - ('year', models.IntegerField(default=ishtar_common.utils.get_current_year, verbose_name='Year')), - ('numeric_reference', models.IntegerField(null=True, verbose_name='Numeric reference', blank=True)), - ('internal_reference', models.CharField(max_length=60, null=True, verbose_name='Internal reference', blank=True)), - ('external_id', models.CharField(max_length=120, null=True, verbose_name='External ID', blank=True)), - ('auto_external_id', models.BooleanField(default=False, verbose_name='External ID is set automatically')), - ('name', models.TextField(null=True, verbose_name='Name', blank=True)), - ('raw_general_contractor', models.CharField(max_length=200, null=True, verbose_name='General contractor (raw)', blank=True)), - ('raw_town_planning_service', models.CharField(max_length=200, null=True, verbose_name='Planning service (raw)', blank=True)), - ('permit_reference', models.TextField(null=True, verbose_name='Permit reference', blank=True)), - ('end_date', models.DateField(null=True, verbose_name='Closing date', blank=True)), - ('creation_date', models.DateField(default=datetime.date.today, null=True, verbose_name='Creation date', blank=True)), - ('reception_date', models.DateField(null=True, verbose_name='Reception date', blank=True)), - ('instruction_deadline', models.DateField(null=True, verbose_name='Instruction deadline', blank=True)), - ('total_surface', models.FloatField(null=True, verbose_name='Total surface (m2)', blank=True)), - ('total_developed_surface', models.FloatField(null=True, verbose_name='Total developed surface (m2)', blank=True)), - ('locality', models.CharField(max_length=100, null=True, verbose_name='Locality', blank=True)), - ('address', models.TextField(null=True, verbose_name='Main address', blank=True)), - ('postal_code', models.CharField(max_length=10, null=True, verbose_name='Main address - postal code', blank=True)), - ('comment', models.TextField(null=True, verbose_name='Comment', blank=True)), - ('research_comment', models.TextField(null=True, verbose_name='Research archaeology comment', blank=True)), - ('classified_area', models.NullBooleanField(verbose_name='Classified area')), - ('protected_area', models.NullBooleanField(verbose_name='Protected area')), - ('cira_advised', models.NullBooleanField(verbose_name='Passage en CIRA')), - ('mh_register', models.NullBooleanField(verbose_name='Sur Monument Historique class\xe9')), - ('mh_listing', models.NullBooleanField(verbose_name='Sur Monument Historique inscrit')), - ('cached_label', models.TextField(null=True, verbose_name='Cached name', blank=True)), - ('imported_line', models.TextField(null=True, verbose_name='Imported line', blank=True)), - ('history_id', models.AutoField(serialize=False, primary_key=True)), - ('history_date', models.DateTimeField()), - ('history_type', models.CharField(max_length=1, choices=[('+', 'Created'), ('~', 'Changed'), ('-', 'Deleted')])), - ], - options={ - 'ordering': ('-history_date', '-history_id'), - 'get_latest_by': 'history_date', - 'verbose_name': 'historical Archaeological file', - }, - ), - migrations.CreateModel( - name='PermitType', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('label', models.CharField(max_length=100, verbose_name='Label')), - ('txt_idx', models.CharField(unique=True, max_length=100, verbose_name='Textual ID', validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+$'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')])), - ('comment', models.TextField(null=True, verbose_name='Comment', blank=True)), - ('available', models.BooleanField(default=True, verbose_name='Available')), - ], - options={ - 'ordering': ('label',), - 'verbose_name': 'Permit type', - 'verbose_name_plural': 'Permit types', - }, - bases=(ishtar_common.models.Cached, models.Model), - ), - migrations.CreateModel( - name='SaisineType', - fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('label', models.CharField(max_length=100, verbose_name='Label')), - ('txt_idx', models.CharField(unique=True, max_length=100, verbose_name='Textual ID', validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+$'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')])), - ('comment', models.TextField(null=True, verbose_name='Comment', blank=True)), - ('available', models.BooleanField(default=True, verbose_name='Available')), - ('delay', models.IntegerField(default=30, verbose_name='Delay (in days)')), - ], - options={ - 'ordering': ('label',), - 'verbose_name': 'Type de saisine', - 'verbose_name_plural': 'Types de saisine', - }, - bases=(ishtar_common.models.Cached, models.Model, ishtar_common.models.ValueGetter), - ), - ] diff --git a/archaeological_files/migrations/0002_auto_20170414_2123.py b/archaeological_files/migrations/0002_auto_20170414_2123.py deleted file mode 100644 index a8c8d7075..000000000 --- a/archaeological_files/migrations/0002_auto_20170414_2123.py +++ /dev/null @@ -1,188 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -import django.db.models.deletion -from django.conf import settings - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('ishtar_common', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='historicalfile', - name='corporation_general_contractor', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.Organization', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='file_type', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='archaeological_files.FileType', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='general_contractor', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.Person', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='history_creator', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to=settings.AUTH_USER_MODEL, null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='history_modifier', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to=settings.AUTH_USER_MODEL, null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='history_user', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='in_charge', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.Person', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='main_town', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.Town', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='organization', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.Organization', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='permit_type', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='archaeological_files.PermitType', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='planning_service', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.Organization', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='related_file', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='archaeological_files.File', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='requested_operation_type', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.OperationType', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='responsible_town_planning_service', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.Person', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='saisine_type', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='archaeological_files.SaisineType', null=True), - ), - migrations.AddField( - model_name='historicalfile', - name='scientist', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.DO_NOTHING, db_constraint=False, blank=True, to='ishtar_common.Person', null=True), - ), - migrations.AddField( - model_name='file', - name='corporation_general_contractor', - field=models.ForeignKey(related_name='general_contractor_files', on_delete=django.db.models.deletion.SET_NULL, verbose_name='General contractor organization', blank=True, to='ishtar_common.Organization', null=True), - ), - migrations.AddField( - model_name='file', - name='departments', - field=models.ManyToManyField(to='ishtar_common.Department', verbose_name='Departments', blank=True), - ), - migrations.AddField( - model_name='file', - name='file_type', - field=models.ForeignKey(verbose_name='File type', to='archaeological_files.FileType'), - ), - migrations.AddField( - model_name='file', - name='general_contractor', - field=models.ForeignKey(related_name='general_contractor_files', on_delete=django.db.models.deletion.SET_NULL, verbose_name='General contractor', blank=True, to='ishtar_common.Person', null=True), - ), - migrations.AddField( - model_name='file', - name='history_creator', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Creator', blank=True, to=settings.AUTH_USER_MODEL, null=True), - ), - migrations.AddField( - model_name='file', - name='history_modifier', - field=models.ForeignKey(related_name='+', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Last editor', blank=True, to=settings.AUTH_USER_MODEL, null=True), - ), - migrations.AddField( - model_name='file', - name='imports', - field=models.ManyToManyField(related_name='imported_archaeological_files_file', to='ishtar_common.Import', blank=True), - ), - migrations.AddField( - model_name='file', - name='in_charge', - field=models.ForeignKey(related_name='file_responsability', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Person in charge', blank=True, to='ishtar_common.Person', null=True), - ), - migrations.AddField( - model_name='file', - name='main_town', - field=models.ForeignKey(related_name='file_main', verbose_name='Town', blank=True, to='ishtar_common.Town', null=True), - ), - migrations.AddField( - model_name='file', - name='organization', - field=models.ForeignKey(related_name='files', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Organization', blank=True, to='ishtar_common.Organization', null=True), - ), - migrations.AddField( - model_name='file', - name='permit_type', - field=models.ForeignKey(verbose_name='Permit type', blank=True, to='archaeological_files.PermitType', null=True), - ), - migrations.AddField( - model_name='file', - name='planning_service', - field=models.ForeignKey(related_name='planning_service_files', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Planning service organization', blank=True, to='ishtar_common.Organization', null=True), - ), - migrations.AddField( - model_name='file', - name='related_file', - field=models.ForeignKey(verbose_name='Related file', blank=True, to='archaeological_files.File', null=True), - ), - migrations.AddField( - model_name='file', - name='requested_operation_type', - field=models.ForeignKey(related_name='+', verbose_name='Requested operation type', blank=True, to='ishtar_common.OperationType', null=True), - ), - migrations.AddField( - model_name='file', - name='responsible_town_planning_service', - field=models.ForeignKey(related_name='responsible_town_planning_service_files', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Responsible for planning service', blank=True, to='ishtar_common.Person', null=True), - ), - migrations.AddField( - model_name='file', - name='saisine_type', - field=models.ForeignKey(verbose_name='Type de saisine', blank=True, to='archaeological_files.SaisineType', null=True), - ), - migrations.AddField( - model_name='file', - name='scientist', - field=models.ForeignKey(related_name='scientist', on_delete=django.db.models.deletion.SET_NULL, verbose_name='Scientist in charge', blank=True, to='ishtar_common.Person', null=True), - ), - migrations.AddField( - model_name='file', - name='towns', - field=models.ManyToManyField(related_name='file', verbose_name='Towns', to='ishtar_common.Town'), - ), - ] diff --git a/archaeological_files/migrations/0003_views.py b/archaeological_files/migrations/0003_views.py deleted file mode 100644 index 5e3d891ad..000000000 --- a/archaeological_files/migrations/0003_views.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -from archaeological_files.models import FileByDepartment - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0002_auto_20170414_2123'), - ] - - operations = [ - migrations.RunSQL(FileByDepartment.CREATE_SQL) - ] diff --git a/archaeological_files/migrations/0004_auto_20170802_1557.py b/archaeological_files/migrations/0004_auto_20170802_1557.py deleted file mode 100644 index bffd44099..000000000 --- a/archaeological_files/migrations/0004_auto_20170802_1557.py +++ /dev/null @@ -1,18 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0003_views'), - ] - - operations = [ - migrations.AlterModelOptions( - name='file', - options={'ordering': ('cached_label',), 'verbose_name': 'Archaeological file', 'verbose_name_plural': 'Archaeological files', 'permissions': (('view_file', 'Can view all Archaeological files'), ('view_own_file', 'Can view own Archaeological file'), ('add_own_file', 'Can add own Archaeological file'), ('change_own_file', 'Can change own Archaeological file'), ('delete_own_file', 'Can delete own Archaeological file'), ('close_file', 'Can close File'))}, - ), - ] diff --git a/archaeological_files/migrations/0005_auto_20170804_1741.py b/archaeological_files/migrations/0005_auto_20170804_1741.py deleted file mode 100644 index 223528cc1..000000000 --- a/archaeological_files/migrations/0005_auto_20170804_1741.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0004_auto_20170802_1557'), - ] - - operations = [ - migrations.AlterField( - model_name='file', - name='main_town', - field=models.ForeignKey(related_name='file_main', verbose_name='Main town', blank=True, to='ishtar_common.Town', null=True), - ), - migrations.AlterField( - model_name='file', - name='towns', - field=models.ManyToManyField(related_name='file', verbose_name='Towns', to='ishtar_common.Town', blank=True), - ), - ] diff --git a/archaeological_files/migrations/0006_auto_20170804_2024.py b/archaeological_files/migrations/0006_auto_20170804_2024.py deleted file mode 100644 index a74700d3c..000000000 --- a/archaeological_files/migrations/0006_auto_20170804_2024.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations -import re -import django.core.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0005_auto_20170804_1741'), - ] - - operations = [ - migrations.AlterField( - model_name='filetype', - name='txt_idx', - field=models.CharField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, max_length=100, verbose_name='Textual ID', validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+$'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')]), - ), - migrations.AlterField( - model_name='permittype', - name='txt_idx', - field=models.CharField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, max_length=100, verbose_name='Textual ID', validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+$'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')]), - ), - migrations.AlterField( - model_name='saisinetype', - name='txt_idx', - field=models.CharField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, max_length=100, verbose_name='Textual ID', validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+$'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')]), - ), - ] diff --git a/archaeological_files/migrations/0007_auto_20170826_1152.py b/archaeological_files/migrations/0007_auto_20170826_1152.py deleted file mode 100644 index be06c16e5..000000000 --- a/archaeological_files/migrations/0007_auto_20170826_1152.py +++ /dev/null @@ -1,32 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-08-26 11:52 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0006_auto_20170804_2024'), - ] - - operations = [ - migrations.AlterField( - model_name='filetype', - name='txt_idx', - field=models.CharField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', max_length=100, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - migrations.AlterField( - model_name='permittype', - name='txt_idx', - field=models.CharField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', max_length=100, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - migrations.AlterField( - model_name='saisinetype', - name='txt_idx', - field=models.CharField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', max_length=100, unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - ] diff --git a/archaeological_files/migrations/0008_auto_20171011_1644.py b/archaeological_files/migrations/0008_auto_20171011_1644.py deleted file mode 100644 index 33dfbf59e..000000000 --- a/archaeological_files/migrations/0008_auto_20171011_1644.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-10-11 16:44 -from __future__ import unicode_literals - -import django.contrib.postgres.search -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0007_auto_20170826_1152'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='search_vector', - field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'), - ), - migrations.AddField( - model_name='historicalfile', - name='search_vector', - field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'), - ), - ] diff --git a/archaeological_files/migrations/0009_auto_20171012_1316.py b/archaeological_files/migrations/0009_auto_20171012_1316.py deleted file mode 100644 index cd33d8243..000000000 --- a/archaeological_files/migrations/0009_auto_20171012_1316.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-10-12 13:16 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0008_auto_20171011_1644'), - ] - - operations = [ - migrations.AlterField( - model_name='file', - name='cached_label', - field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='historicalfile', - name='cached_label', - field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Cached name'), - ), - ] diff --git a/archaeological_files/migrations/0010_auto_20171017_1840.py b/archaeological_files/migrations/0010_auto_20171017_1840.py deleted file mode 100644 index 04eb5b1cc..000000000 --- a/archaeological_files/migrations/0010_auto_20171017_1840.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-10-17 18:40 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0009_auto_20171012_1316'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}), - ), - migrations.AddField( - model_name='historicalfile', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(db_index=True, default={}), - ), - ] diff --git a/archaeological_files/migrations/0011_auto_20171026_1827.py b/archaeological_files/migrations/0011_auto_20171026_1827.py deleted file mode 100644 index 93cbaf62c..000000000 --- a/archaeological_files/migrations/0011_auto_20171026_1827.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-10-26 18:27 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0010_auto_20171017_1840'), - ] - - operations = [ - migrations.AlterField( - model_name='file', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, db_index=True, default={}), - ), - migrations.AlterField( - model_name='historicalfile', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, db_index=True, default={}), - ), - ] diff --git a/archaeological_files/migrations/0012_auto_20180403_1120.py b/archaeological_files/migrations/0012_auto_20180403_1120.py deleted file mode 100644 index 629b8754d..000000000 --- a/archaeological_files/migrations/0012_auto_20180403_1120.py +++ /dev/null @@ -1,47 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-04-03 11:20 -from __future__ import unicode_literals - -import django.core.validators -from django.db import migrations, models -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0011_auto_20171026_1827'), - ] - - operations = [ - migrations.AlterField( - model_name='filetype', - name='label', - field=models.TextField(verbose_name='Label'), - ), - migrations.AlterField( - model_name='filetype', - name='txt_idx', - field=models.TextField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - migrations.AlterField( - model_name='permittype', - name='label', - field=models.TextField(verbose_name='Label'), - ), - migrations.AlterField( - model_name='permittype', - name='txt_idx', - field=models.TextField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - migrations.AlterField( - model_name='saisinetype', - name='label', - field=models.TextField(verbose_name='Label'), - ), - migrations.AlterField( - model_name='saisinetype', - name='txt_idx', - field=models.TextField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - ] diff --git a/archaeological_files/migrations/0013_file_documents.py b/archaeological_files/migrations/0013_file_documents.py deleted file mode 100644 index ca731e531..000000000 --- a/archaeological_files/migrations/0013_file_documents.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-08-28 11:43 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0069_userprofile_show_field_number'), - ('archaeological_files', '0012_auto_20180403_1120'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='documents', - field=models.ManyToManyField(blank=True, related_name='files', to='ishtar_common.Document', verbose_name='Documents'), - ), - ] diff --git a/archaeological_files/migrations/0014_auto_20181017_1642.py b/archaeological_files/migrations/0014_auto_20181017_1642.py deleted file mode 100644 index fc341256e..000000000 --- a/archaeological_files/migrations/0014_auto_20181017_1642.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-10-17 16:42 -from __future__ import unicode_literals - -from django.db import migrations, models -import datetime - -from ishtar_common.utils_migrations import reinit_last_modified - - -def migrate_codes(apps, schema_editor): - models = ['File'] - reinit_last_modified( - apps, 'archaeological_files', models - ) - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0013_file_documents'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='last_modified', - field=models.DateTimeField(default=datetime.datetime.now), - ), - migrations.AddField( - model_name='historicalfile', - name='last_modified', - field=models.DateTimeField(default=datetime.datetime.now), - ), - migrations.RunPython(migrate_codes) - ] diff --git a/archaeological_files/migrations/0015_auto_20181017_1854.py b/archaeological_files/migrations/0015_auto_20181017_1854.py deleted file mode 100644 index 5c7eee3b4..000000000 --- a/archaeological_files/migrations/0015_auto_20181017_1854.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-10-17 18:54 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0014_auto_20181017_1642'), - ] - - operations = [ - migrations.AlterField( - model_name='file', - name='last_modified', - field=models.DateTimeField(auto_now=True), - ), - migrations.AlterField( - model_name='historicalfile', - name='last_modified', - field=models.DateTimeField(blank=True, editable=False), - ), - ] diff --git a/archaeological_files/migrations/0016_auto_20181203_1442.py b/archaeological_files/migrations/0016_auto_20181203_1442.py deleted file mode 100644 index 08f1c01ea..000000000 --- a/archaeological_files/migrations/0016_auto_20181203_1442.py +++ /dev/null @@ -1,433 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-12-03 14:42 -from __future__ import unicode_literals - -import datetime -from django.conf import settings -import django.contrib.postgres.search -import django.core.validators -from django.db import migrations, models -import django.db.models.deletion -import ishtar_common.utils -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0015_auto_20181017_1854'), - ] - - operations = [ - migrations.AlterModelOptions( - name='file', - options={'ordering': ('cached_label',), 'permissions': (('view_file', 'Can view all Archaeological files'), ('view_own_file', 'Can view own Archaeological file'), ('add_own_file', 'Can add own Archaeological file'), ('change_own_file', 'Can change own Archaeological file'), ('delete_own_file', 'Can delete own Archaeological file'), ('close_file', 'Can close File')), 'verbose_name': 'Dossier', 'verbose_name_plural': 'Dossiers'}, - ), - migrations.AlterModelOptions( - name='filetype', - options={'ordering': ('label',), 'verbose_name': 'Type de dossier arch\xe9ologique', 'verbose_name_plural': 'Types de dossier arch\xe9ologique'}, - ), - migrations.AlterModelOptions( - name='historicalfile', - options={'get_latest_by': 'history_date', 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Dossier'}, - ), - migrations.AlterModelOptions( - name='permittype', - options={'ordering': ('label',), 'verbose_name': 'Type de permis', 'verbose_name_plural': 'Types de permis'}, - ), - migrations.AlterField( - model_name='file', - name='address', - field=models.TextField(blank=True, null=True, verbose_name='Adresse des terrains'), - ), - migrations.AlterField( - model_name='file', - name='auto_external_id', - field=models.BooleanField(default=False, verbose_name="L'identifiant est attribu\xe9 automatiquement"), - ), - migrations.AlterField( - model_name='file', - name='cached_label', - field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Nom en cache'), - ), - migrations.AlterField( - model_name='file', - name='classified_area', - field=models.NullBooleanField(verbose_name="Au sein d'un site class\xe9"), - ), - migrations.AlterField( - model_name='file', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Commentaire'), - ), - migrations.AlterField( - model_name='file', - name='corporation_general_contractor', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='general_contractor_files', to='ishtar_common.Organization', verbose_name="Organisation de l'am\xe9nageur"), - ), - migrations.AlterField( - model_name='file', - name='creation_date', - field=models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='Date de cr\xe9ation'), - ), - migrations.AlterField( - model_name='file', - name='departments', - field=models.ManyToManyField(blank=True, to='ishtar_common.Department', verbose_name='D\xe9partements'), - ), - migrations.AlterField( - model_name='file', - name='end_date', - field=models.DateField(blank=True, null=True, verbose_name='Date de cl\xf4ture'), - ), - migrations.AlterField( - model_name='file', - name='external_id', - field=models.CharField(blank=True, max_length=120, null=True, verbose_name='Identifiant'), - ), - migrations.AlterField( - model_name='file', - name='file_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_files.FileType', verbose_name='Type de dossier'), - ), - migrations.AlterField( - model_name='file', - name='general_contractor', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='general_contractor_files', to='ishtar_common.Person', verbose_name='Am\xe9nageur'), - ), - migrations.AlterField( - model_name='file', - name='history_creator', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Cr\xe9ateur'), - ), - migrations.AlterField( - model_name='file', - name='history_modifier', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Dernier \xe9diteur'), - ), - migrations.AlterField( - model_name='file', - name='imported_line', - field=models.TextField(blank=True, null=True, verbose_name='Ligne import\xe9e'), - ), - migrations.AlterField( - model_name='file', - name='in_charge', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='file_responsability', to='ishtar_common.Person', verbose_name='Dossier suivi par'), - ), - migrations.AlterField( - model_name='file', - name='instruction_deadline', - field=models.DateField(blank=True, null=True, verbose_name="Date limite d'instruction"), - ), - migrations.AlterField( - model_name='file', - name='internal_reference', - field=models.CharField(blank=True, max_length=60, null=True, verbose_name='R\xe9f\xe9rence interne'), - ), - migrations.AlterField( - model_name='file', - name='locality', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Lieu-dit'), - ), - migrations.AlterField( - model_name='file', - name='main_town', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='file_main', to='ishtar_common.Town', verbose_name='Commune principale'), - ), - migrations.AlterField( - model_name='file', - name='name', - field=models.TextField(blank=True, null=True, verbose_name='Nom'), - ), - migrations.AlterField( - model_name='file', - name='numeric_reference', - field=models.IntegerField(blank=True, null=True, verbose_name='R\xe9f\xe9rence num\xe9rique'), - ), - migrations.AlterField( - model_name='file', - name='organization', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='files', to='ishtar_common.Organization', verbose_name='Organisation'), - ), - migrations.AlterField( - model_name='file', - name='permit_reference', - field=models.TextField(blank=True, null=True, verbose_name='R\xe9f\xe9rence du permis'), - ), - migrations.AlterField( - model_name='file', - name='permit_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_files.PermitType', verbose_name='Type de permis'), - ), - migrations.AlterField( - model_name='file', - name='planning_service', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='planning_service_files', to='ishtar_common.Organization', verbose_name='Service instructeur'), - ), - migrations.AlterField( - model_name='file', - name='postal_code', - field=models.CharField(blank=True, max_length=10, null=True, verbose_name='Adresse des terrains - code postal'), - ), - migrations.AlterField( - model_name='file', - name='protected_area', - field=models.NullBooleanField(verbose_name="Au sein d'un secteur sauvegard\xe9"), - ), - migrations.AlterField( - model_name='file', - name='raw_general_contractor', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Am\xe9nageur (brut)'), - ), - migrations.AlterField( - model_name='file', - name='raw_town_planning_service', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Service instructeur (brut)'), - ), - migrations.AlterField( - model_name='file', - name='reception_date', - field=models.DateField(blank=True, null=True, verbose_name='Date de r\xe9ception'), - ), - migrations.AlterField( - model_name='file', - name='related_file', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='archaeological_files.File', verbose_name='Dossier li\xe9 \xe0'), - ), - migrations.AlterField( - model_name='file', - name='requested_operation_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='ishtar_common.OperationType', verbose_name="Type d'op\xe9ration demand\xe9e"), - ), - migrations.AlterField( - model_name='file', - name='research_comment', - field=models.TextField(blank=True, null=True, verbose_name="Commentaire relatif \xe0 l'arch\xe9ologie programm\xe9e"), - ), - migrations.AlterField( - model_name='file', - name='responsible_town_planning_service', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='responsible_town_planning_service_files', to='ishtar_common.Person', verbose_name='Responsable pour le service instructeur'), - ), - migrations.AlterField( - model_name='file', - name='scientist', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='scientist', to='ishtar_common.Person', verbose_name='Responsable scientifique'), - ), - migrations.AlterField( - model_name='file', - name='search_vector', - field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto-rempli \xe0 la sauvegarde', null=True, verbose_name='Vecteur de recherche'), - ), - migrations.AlterField( - model_name='file', - name='total_developed_surface', - field=models.FloatField(blank=True, null=True, verbose_name='Surface totale am\xe9nag\xe9e (m2)'), - ), - migrations.AlterField( - model_name='file', - name='total_surface', - field=models.FloatField(blank=True, null=True, verbose_name='Surface totale des terrains (m2)'), - ), - migrations.AlterField( - model_name='file', - name='towns', - field=models.ManyToManyField(blank=True, related_name='file', to='ishtar_common.Town', verbose_name='Communes'), - ), - migrations.AlterField( - model_name='file', - name='year', - field=models.IntegerField(default=ishtar_common.utils.get_current_year, verbose_name='Ann\xe9e'), - ), - migrations.AlterField( - model_name='filetype', - name='available', - field=models.BooleanField(default=True, verbose_name='Disponible'), - ), - migrations.AlterField( - model_name='filetype', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Commentaire'), - ), - migrations.AlterField( - model_name='filetype', - name='label', - field=models.TextField(verbose_name='D\xe9nomination'), - ), - migrations.AlterField( - model_name='filetype', - name='txt_idx', - field=models.TextField(help_text='Le "slug" est une version standardis\xe9e du nom. Il ne contient que des lettres en minuscule, des nombres et des tirets (-). Chaque "slug" doit \xeatre unique dans la typologie.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et des traits d'union.", 'invalid')], verbose_name='Identifiant textuel'), - ), - migrations.AlterField( - model_name='historicalfile', - name='address', - field=models.TextField(blank=True, null=True, verbose_name='Adresse des terrains'), - ), - migrations.AlterField( - model_name='historicalfile', - name='auto_external_id', - field=models.BooleanField(default=False, verbose_name="L'identifiant est attribu\xe9 automatiquement"), - ), - migrations.AlterField( - model_name='historicalfile', - name='cached_label', - field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Nom en cache'), - ), - migrations.AlterField( - model_name='historicalfile', - name='classified_area', - field=models.NullBooleanField(verbose_name="Au sein d'un site class\xe9"), - ), - migrations.AlterField( - model_name='historicalfile', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Commentaire'), - ), - migrations.AlterField( - model_name='historicalfile', - name='creation_date', - field=models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='Date de cr\xe9ation'), - ), - migrations.AlterField( - model_name='historicalfile', - name='end_date', - field=models.DateField(blank=True, null=True, verbose_name='Date de cl\xf4ture'), - ), - migrations.AlterField( - model_name='historicalfile', - name='external_id', - field=models.CharField(blank=True, max_length=120, null=True, verbose_name='Identifiant'), - ), - migrations.AlterField( - model_name='historicalfile', - name='imported_line', - field=models.TextField(blank=True, null=True, verbose_name='Ligne import\xe9e'), - ), - migrations.AlterField( - model_name='historicalfile', - name='instruction_deadline', - field=models.DateField(blank=True, null=True, verbose_name="Date limite d'instruction"), - ), - migrations.AlterField( - model_name='historicalfile', - name='internal_reference', - field=models.CharField(blank=True, max_length=60, null=True, verbose_name='R\xe9f\xe9rence interne'), - ), - migrations.AlterField( - model_name='historicalfile', - name='locality', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Lieu-dit'), - ), - migrations.AlterField( - model_name='historicalfile', - name='name', - field=models.TextField(blank=True, null=True, verbose_name='Nom'), - ), - migrations.AlterField( - model_name='historicalfile', - name='numeric_reference', - field=models.IntegerField(blank=True, null=True, verbose_name='R\xe9f\xe9rence num\xe9rique'), - ), - migrations.AlterField( - model_name='historicalfile', - name='permit_reference', - field=models.TextField(blank=True, null=True, verbose_name='R\xe9f\xe9rence du permis'), - ), - migrations.AlterField( - model_name='historicalfile', - name='postal_code', - field=models.CharField(blank=True, max_length=10, null=True, verbose_name='Adresse des terrains - code postal'), - ), - migrations.AlterField( - model_name='historicalfile', - name='protected_area', - field=models.NullBooleanField(verbose_name="Au sein d'un secteur sauvegard\xe9"), - ), - migrations.AlterField( - model_name='historicalfile', - name='raw_general_contractor', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Am\xe9nageur (brut)'), - ), - migrations.AlterField( - model_name='historicalfile', - name='raw_town_planning_service', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Service instructeur (brut)'), - ), - migrations.AlterField( - model_name='historicalfile', - name='reception_date', - field=models.DateField(blank=True, null=True, verbose_name='Date de r\xe9ception'), - ), - migrations.AlterField( - model_name='historicalfile', - name='research_comment', - field=models.TextField(blank=True, null=True, verbose_name="Commentaire relatif \xe0 l'arch\xe9ologie programm\xe9e"), - ), - migrations.AlterField( - model_name='historicalfile', - name='search_vector', - field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto-rempli \xe0 la sauvegarde', null=True, verbose_name='Vecteur de recherche'), - ), - migrations.AlterField( - model_name='historicalfile', - name='total_developed_surface', - field=models.FloatField(blank=True, null=True, verbose_name='Surface totale am\xe9nag\xe9e (m2)'), - ), - migrations.AlterField( - model_name='historicalfile', - name='total_surface', - field=models.FloatField(blank=True, null=True, verbose_name='Surface totale des terrains (m2)'), - ), - migrations.AlterField( - model_name='historicalfile', - name='year', - field=models.IntegerField(default=ishtar_common.utils.get_current_year, verbose_name='Ann\xe9e'), - ), - migrations.AlterField( - model_name='permittype', - name='available', - field=models.BooleanField(default=True, verbose_name='Disponible'), - ), - migrations.AlterField( - model_name='permittype', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Commentaire'), - ), - migrations.AlterField( - model_name='permittype', - name='label', - field=models.TextField(verbose_name='D\xe9nomination'), - ), - migrations.AlterField( - model_name='permittype', - name='txt_idx', - field=models.TextField(help_text='Le "slug" est une version standardis\xe9e du nom. Il ne contient que des lettres en minuscule, des nombres et des tirets (-). Chaque "slug" doit \xeatre unique dans la typologie.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et des traits d'union.", 'invalid')], verbose_name='Identifiant textuel'), - ), - migrations.AlterField( - model_name='saisinetype', - name='available', - field=models.BooleanField(default=True, verbose_name='Disponible'), - ), - migrations.AlterField( - model_name='saisinetype', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Commentaire'), - ), - migrations.AlterField( - model_name='saisinetype', - name='delay', - field=models.IntegerField(default=30, verbose_name='D\xe9lai (en jours)'), - ), - migrations.AlterField( - model_name='saisinetype', - name='label', - field=models.TextField(verbose_name='D\xe9nomination'), - ), - migrations.AlterField( - model_name='saisinetype', - name='txt_idx', - field=models.TextField(help_text='Le "slug" est une version standardis\xe9e du nom. Il ne contient que des lettres en minuscule, des nombres et des tirets (-). Chaque "slug" doit \xeatre unique dans la typologie.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z'), "Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et des traits d'union.", 'invalid')], verbose_name='Identifiant textuel'), - ), - ] diff --git a/archaeological_files/migrations/0017_auto_20190111_1755.py b/archaeological_files/migrations/0017_auto_20190111_1755.py deleted file mode 100644 index 043cafa7d..000000000 --- a/archaeological_files/migrations/0017_auto_20190111_1755.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-01-11 17:55 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0016_auto_20181203_1442'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}), - ), - migrations.AddField( - model_name='historicalfile', - name='history_m2m', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}), - ), - ] diff --git a/archaeological_files/migrations/0018_auto_20190206_1522.py b/archaeological_files/migrations/0018_auto_20190206_1522.py deleted file mode 100644 index 321920c61..000000000 --- a/archaeological_files/migrations/0018_auto_20190206_1522.py +++ /dev/null @@ -1,41 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2019-02-06 15:22 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0017_auto_20190111_1755'), - ] - - operations = [ - migrations.AlterField( - model_name='file', - name='main_town', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='file_main', to='ishtar_common.Town', verbose_name='Commune principale'), - ), - migrations.AlterField( - model_name='file', - name='permit_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_files.PermitType', verbose_name='Type de permis'), - ), - migrations.AlterField( - model_name='file', - name='related_file', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_files.File', verbose_name='Dossier li\xe9 \xe0'), - ), - migrations.AlterField( - model_name='file', - name='requested_operation_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ishtar_common.OperationType', verbose_name="Type d'op\xe9ration demand\xe9e"), - ), - migrations.AlterField( - model_name='file', - name='saisine_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_files.SaisineType', verbose_name='Type de saisine'), - ), - ] diff --git a/archaeological_files/migrations/0019_auto_20190628_1257.py b/archaeological_files/migrations/0019_auto_20190628_1257.py deleted file mode 100644 index d76494330..000000000 --- a/archaeological_files/migrations/0019_auto_20190628_1257.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-06-28 12:57 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0018_auto_20190206_1522'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='need_update', - field=models.BooleanField(default=False, verbose_name='Need update'), - ), - migrations.AddField( - model_name='historicalfile', - name='need_update', - field=models.BooleanField(default=False, verbose_name='Need update'), - ), - ] diff --git a/archaeological_files/migrations/0020_auto_20190910_1242.py b/archaeological_files/migrations/0020_auto_20190910_1242.py deleted file mode 100644 index f3ba52b86..000000000 --- a/archaeological_files/migrations/0020_auto_20190910_1242.py +++ /dev/null @@ -1,433 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-09-10 12:42 -from __future__ import unicode_literals - -import datetime -from django.conf import settings -import django.contrib.postgres.search -import django.core.validators -from django.db import migrations, models -import django.db.models.deletion -import ishtar_common.utils -import re - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0019_auto_20190628_1257'), - ] - - operations = [ - migrations.AlterModelOptions( - name='file', - options={'ordering': ('cached_label',), 'permissions': (('view_file', 'Can view all Archaeological files'), ('view_own_file', 'Can view own Archaeological file'), ('add_own_file', 'Can add own Archaeological file'), ('change_own_file', 'Can change own Archaeological file'), ('delete_own_file', 'Can delete own Archaeological file'), ('close_file', 'Can close File')), 'verbose_name': 'Archaeological file', 'verbose_name_plural': 'Archaeological files'}, - ), - migrations.AlterModelOptions( - name='filetype', - options={'ordering': ('label',), 'verbose_name': 'Archaeological file type', 'verbose_name_plural': 'Archaeological file types'}, - ), - migrations.AlterModelOptions( - name='historicalfile', - options={'get_latest_by': 'history_date', 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical Archaeological file'}, - ), - migrations.AlterModelOptions( - name='permittype', - options={'ordering': ('label',), 'verbose_name': 'Permit type', 'verbose_name_plural': 'Permit types'}, - ), - migrations.AlterField( - model_name='file', - name='address', - field=models.TextField(blank=True, null=True, verbose_name='Main address'), - ), - migrations.AlterField( - model_name='file', - name='auto_external_id', - field=models.BooleanField(default=False, verbose_name='External ID is set automatically'), - ), - migrations.AlterField( - model_name='file', - name='cached_label', - field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='file', - name='classified_area', - field=models.NullBooleanField(verbose_name='Classified area'), - ), - migrations.AlterField( - model_name='file', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Comment'), - ), - migrations.AlterField( - model_name='file', - name='corporation_general_contractor', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='general_contractor_files', to='ishtar_common.Organization', verbose_name='General contractor organization'), - ), - migrations.AlterField( - model_name='file', - name='creation_date', - field=models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='Creation date'), - ), - migrations.AlterField( - model_name='file', - name='departments', - field=models.ManyToManyField(blank=True, to='ishtar_common.Department', verbose_name='Departments'), - ), - migrations.AlterField( - model_name='file', - name='end_date', - field=models.DateField(blank=True, null=True, verbose_name='Closing date'), - ), - migrations.AlterField( - model_name='file', - name='external_id', - field=models.CharField(blank=True, max_length=120, null=True, verbose_name='External ID'), - ), - migrations.AlterField( - model_name='file', - name='file_type', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_files.FileType', verbose_name='File type'), - ), - migrations.AlterField( - model_name='file', - name='general_contractor', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='general_contractor_files', to='ishtar_common.Person', verbose_name='General contractor'), - ), - migrations.AlterField( - model_name='file', - name='history_creator', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Creator'), - ), - migrations.AlterField( - model_name='file', - name='history_modifier', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Last editor'), - ), - migrations.AlterField( - model_name='file', - name='imported_line', - field=models.TextField(blank=True, null=True, verbose_name='Imported line'), - ), - migrations.AlterField( - model_name='file', - name='in_charge', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='file_responsability', to='ishtar_common.Person', verbose_name='Person in charge'), - ), - migrations.AlterField( - model_name='file', - name='instruction_deadline', - field=models.DateField(blank=True, null=True, verbose_name='Instruction deadline'), - ), - migrations.AlterField( - model_name='file', - name='internal_reference', - field=models.CharField(blank=True, max_length=60, null=True, verbose_name='Internal reference'), - ), - migrations.AlterField( - model_name='file', - name='locality', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Locality'), - ), - migrations.AlterField( - model_name='file', - name='main_town', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='file_main', to='ishtar_common.Town', verbose_name='Main town'), - ), - migrations.AlterField( - model_name='file', - name='name', - field=models.TextField(blank=True, null=True, verbose_name='Name'), - ), - migrations.AlterField( - model_name='file', - name='numeric_reference', - field=models.IntegerField(blank=True, null=True, verbose_name='Numeric reference'), - ), - migrations.AlterField( - model_name='file', - name='organization', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='files', to='ishtar_common.Organization', verbose_name='Organization'), - ), - migrations.AlterField( - model_name='file', - name='permit_reference', - field=models.TextField(blank=True, null=True, verbose_name='Permit reference'), - ), - migrations.AlterField( - model_name='file', - name='permit_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_files.PermitType', verbose_name='Permit type'), - ), - migrations.AlterField( - model_name='file', - name='planning_service', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='planning_service_files', to='ishtar_common.Organization', verbose_name='Planning service organization'), - ), - migrations.AlterField( - model_name='file', - name='postal_code', - field=models.CharField(blank=True, max_length=10, null=True, verbose_name='Main address - postal code'), - ), - migrations.AlterField( - model_name='file', - name='protected_area', - field=models.NullBooleanField(verbose_name='Protected area'), - ), - migrations.AlterField( - model_name='file', - name='raw_general_contractor', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='General contractor (raw)'), - ), - migrations.AlterField( - model_name='file', - name='raw_town_planning_service', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Planning service (raw)'), - ), - migrations.AlterField( - model_name='file', - name='reception_date', - field=models.DateField(blank=True, null=True, verbose_name='Reception date'), - ), - migrations.AlterField( - model_name='file', - name='related_file', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='archaeological_files.File', verbose_name='Related file'), - ), - migrations.AlterField( - model_name='file', - name='requested_operation_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='ishtar_common.OperationType', verbose_name='Requested operation type'), - ), - migrations.AlterField( - model_name='file', - name='research_comment', - field=models.TextField(blank=True, null=True, verbose_name='Research archaeology comment'), - ), - migrations.AlterField( - model_name='file', - name='responsible_town_planning_service', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='responsible_town_planning_service_files', to='ishtar_common.Person', verbose_name='Responsible for planning service'), - ), - migrations.AlterField( - model_name='file', - name='scientist', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='scientist', to='ishtar_common.Person', verbose_name='Scientist in charge'), - ), - migrations.AlterField( - model_name='file', - name='search_vector', - field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'), - ), - migrations.AlterField( - model_name='file', - name='total_developed_surface', - field=models.FloatField(blank=True, null=True, verbose_name='Total developed surface (m2)'), - ), - migrations.AlterField( - model_name='file', - name='total_surface', - field=models.FloatField(blank=True, null=True, verbose_name='Total surface (m2)'), - ), - migrations.AlterField( - model_name='file', - name='towns', - field=models.ManyToManyField(blank=True, related_name='file', to='ishtar_common.Town', verbose_name='Towns'), - ), - migrations.AlterField( - model_name='file', - name='year', - field=models.IntegerField(default=ishtar_common.utils.get_current_year, verbose_name='Year'), - ), - migrations.AlterField( - model_name='filetype', - name='available', - field=models.BooleanField(default=True, verbose_name='Available'), - ), - migrations.AlterField( - model_name='filetype', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Comment'), - ), - migrations.AlterField( - model_name='filetype', - name='label', - field=models.TextField(verbose_name='Label'), - ), - migrations.AlterField( - model_name='filetype', - name='txt_idx', - field=models.TextField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z', 32), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - migrations.AlterField( - model_name='historicalfile', - name='address', - field=models.TextField(blank=True, null=True, verbose_name='Main address'), - ), - migrations.AlterField( - model_name='historicalfile', - name='auto_external_id', - field=models.BooleanField(default=False, verbose_name='External ID is set automatically'), - ), - migrations.AlterField( - model_name='historicalfile', - name='cached_label', - field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Cached name'), - ), - migrations.AlterField( - model_name='historicalfile', - name='classified_area', - field=models.NullBooleanField(verbose_name='Classified area'), - ), - migrations.AlterField( - model_name='historicalfile', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Comment'), - ), - migrations.AlterField( - model_name='historicalfile', - name='creation_date', - field=models.DateField(blank=True, default=datetime.date.today, null=True, verbose_name='Creation date'), - ), - migrations.AlterField( - model_name='historicalfile', - name='end_date', - field=models.DateField(blank=True, null=True, verbose_name='Closing date'), - ), - migrations.AlterField( - model_name='historicalfile', - name='external_id', - field=models.CharField(blank=True, max_length=120, null=True, verbose_name='External ID'), - ), - migrations.AlterField( - model_name='historicalfile', - name='imported_line', - field=models.TextField(blank=True, null=True, verbose_name='Imported line'), - ), - migrations.AlterField( - model_name='historicalfile', - name='instruction_deadline', - field=models.DateField(blank=True, null=True, verbose_name='Instruction deadline'), - ), - migrations.AlterField( - model_name='historicalfile', - name='internal_reference', - field=models.CharField(blank=True, max_length=60, null=True, verbose_name='Internal reference'), - ), - migrations.AlterField( - model_name='historicalfile', - name='locality', - field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Locality'), - ), - migrations.AlterField( - model_name='historicalfile', - name='name', - field=models.TextField(blank=True, null=True, verbose_name='Name'), - ), - migrations.AlterField( - model_name='historicalfile', - name='numeric_reference', - field=models.IntegerField(blank=True, null=True, verbose_name='Numeric reference'), - ), - migrations.AlterField( - model_name='historicalfile', - name='permit_reference', - field=models.TextField(blank=True, null=True, verbose_name='Permit reference'), - ), - migrations.AlterField( - model_name='historicalfile', - name='postal_code', - field=models.CharField(blank=True, max_length=10, null=True, verbose_name='Main address - postal code'), - ), - migrations.AlterField( - model_name='historicalfile', - name='protected_area', - field=models.NullBooleanField(verbose_name='Protected area'), - ), - migrations.AlterField( - model_name='historicalfile', - name='raw_general_contractor', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='General contractor (raw)'), - ), - migrations.AlterField( - model_name='historicalfile', - name='raw_town_planning_service', - field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Planning service (raw)'), - ), - migrations.AlterField( - model_name='historicalfile', - name='reception_date', - field=models.DateField(blank=True, null=True, verbose_name='Reception date'), - ), - migrations.AlterField( - model_name='historicalfile', - name='research_comment', - field=models.TextField(blank=True, null=True, verbose_name='Research archaeology comment'), - ), - migrations.AlterField( - model_name='historicalfile', - name='search_vector', - field=django.contrib.postgres.search.SearchVectorField(blank=True, help_text='Auto filled at save', null=True, verbose_name='Search vector'), - ), - migrations.AlterField( - model_name='historicalfile', - name='total_developed_surface', - field=models.FloatField(blank=True, null=True, verbose_name='Total developed surface (m2)'), - ), - migrations.AlterField( - model_name='historicalfile', - name='total_surface', - field=models.FloatField(blank=True, null=True, verbose_name='Total surface (m2)'), - ), - migrations.AlterField( - model_name='historicalfile', - name='year', - field=models.IntegerField(default=ishtar_common.utils.get_current_year, verbose_name='Year'), - ), - migrations.AlterField( - model_name='permittype', - name='available', - field=models.BooleanField(default=True, verbose_name='Available'), - ), - migrations.AlterField( - model_name='permittype', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Comment'), - ), - migrations.AlterField( - model_name='permittype', - name='label', - field=models.TextField(verbose_name='Label'), - ), - migrations.AlterField( - model_name='permittype', - name='txt_idx', - field=models.TextField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z', 32), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - migrations.AlterField( - model_name='saisinetype', - name='available', - field=models.BooleanField(default=True, verbose_name='Available'), - ), - migrations.AlterField( - model_name='saisinetype', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Comment'), - ), - migrations.AlterField( - model_name='saisinetype', - name='delay', - field=models.IntegerField(default=30, verbose_name='Delay (in days)'), - ), - migrations.AlterField( - model_name='saisinetype', - name='label', - field=models.TextField(verbose_name='Label'), - ), - migrations.AlterField( - model_name='saisinetype', - name='txt_idx', - field=models.TextField(help_text='The slug is the standardized version of the name. It contains only lowercase letters, numbers and hyphens. Each slug must be unique.', unique=True, validators=[django.core.validators.RegexValidator(re.compile('^[-a-zA-Z0-9_]+\\Z', 32), "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens.", 'invalid')], verbose_name='Textual ID'), - ), - ] diff --git a/archaeological_files/migrations/0021_auto_20190910_1248.py b/archaeological_files/migrations/0021_auto_20190910_1248.py deleted file mode 100644 index 7eb3823b4..000000000 --- a/archaeological_files/migrations/0021_auto_20190910_1248.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-09-10 12:48 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0020_auto_20190910_1242'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='locked', - field=models.BooleanField(default=False, verbose_name='Item locked for edition'), - ), - migrations.AddField( - model_name='historicalfile', - name='locked', - field=models.BooleanField(default=False, verbose_name='Item locked for edition'), - ), - ] diff --git a/archaeological_files/migrations/0022_auto_20190910_1324.py b/archaeological_files/migrations/0022_auto_20190910_1324.py deleted file mode 100644 index f3f2e1a06..000000000 --- a/archaeological_files/migrations/0022_auto_20190910_1324.py +++ /dev/null @@ -1,28 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-09-10 13:24 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('archaeological_files', '0021_auto_20190910_1248'), - ] - - operations = [ - migrations.AddField( - model_name='file', - name='lock_user', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Locked by'), - ), - migrations.AddField( - model_name='historicalfile', - name='lock_user', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/archaeological_files/migrations/0023_auto_20191216_1013.py b/archaeological_files/migrations/0023_auto_20191216_1013.py deleted file mode 100644 index bba3422cb..000000000 --- a/archaeological_files/migrations/0023_auto_20191216_1013.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-12-16 10:13 -from __future__ import unicode_literals - -import django.contrib.postgres.fields.jsonb -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0022_auto_20190910_1324'), - ] - - operations = [ - migrations.AlterField( - model_name='file', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}), - ), - migrations.AlterField( - model_name='historicalfile', - name='data', - field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}), - ), - ] diff --git a/archaeological_files/migrations/0024_auto_20191216_1034.py b/archaeological_files/migrations/0024_auto_20191216_1034.py deleted file mode 100644 index ff1473187..000000000 --- a/archaeological_files/migrations/0024_auto_20191216_1034.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-12-16 10:34 -from __future__ import unicode_literals - -import django.contrib.postgres.indexes -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_files', '0023_auto_20191216_1013'), - ('ishtar_common', '0116_create_gist_extension'), - ] - - operations = [ - migrations.AddIndex( - model_name='file', - index=django.contrib.postgres.indexes.GinIndex(fields=['data'], name='archaeologi_data_44e442_gin'), - ), - ] diff --git a/archaeological_files/migrations/0101_squashed.py b/archaeological_files/migrations/0101_squashed.py index caa6d046e..0eb99aa27 100644 --- a/archaeological_files/migrations/0101_squashed.py +++ b/archaeological_files/migrations/0101_squashed.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import archaeological_operations.models +import archaeological_files.models import datetime from django.conf import settings import django.contrib.postgres.fields.jsonb @@ -21,7 +22,6 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('ishtar_common', '0201_squashed'), - ('archaeological_files', '0024_auto_20191216_1034') ] operations = [ @@ -314,4 +314,8 @@ class Migration(migrations.Migration): model_name='file', index=django.contrib.postgres.indexes.GinIndex(fields=['data'], name='archaeologi_data_44e442_gin'), ), + migrations.RunSQL( + archaeological_files.models.FileByDepartment.DELETE_SQL), + migrations.RunSQL( + archaeological_files.models.FileByDepartment.CREATE_SQL), ] diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 310301c59..cb327f970 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -756,7 +756,7 @@ class FileByDepartment(models.Model): AS ON DELETE TO file_department DO INSTEAD(); """ DELETE_SQL = """ - DROP VIEW file_department; + DROP VIEW IF EXISTS file_department; """ file = models.ForeignKey(File, verbose_name=_(u"File")) department = models.ForeignKey(Department, verbose_name=_(u"Department"), |