summaryrefslogtreecommitdiff
path: root/archaeological_operations
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-12-03 14:54:20 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-02-28 12:15:22 +0100
commita971793ef9759c6b99c674ba676607abd743e76b (patch)
treecd95c65028eeac282b12d435e4a5c44045123575 /archaeological_operations
parent42e32d4cdd18474c4daf5bf960cebb0855dad9ef (diff)
downloadIshtar-a971793ef9759c6b99c674ba676607abd743e76b.tar.bz2
Ishtar-a971793ef9759c6b99c674ba676607abd743e76b.zip
TextField: blank=True, null=True -> blank=True, default=""
Diffstat (limited to 'archaeological_operations')
-rw-r--r--archaeological_operations/migrations/0105_auto_20201203_1453.py356
-rw-r--r--archaeological_operations/models.py63
2 files changed, 386 insertions, 33 deletions
diff --git a/archaeological_operations/migrations/0105_auto_20201203_1453.py b/archaeological_operations/migrations/0105_auto_20201203_1453.py
new file mode 100644
index 000000000..2547095f4
--- /dev/null
+++ b/archaeological_operations/migrations/0105_auto_20201203_1453.py
@@ -0,0 +1,356 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-12-03 14:53
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ atomic = False
+
+ dependencies = [
+ ('archaeological_operations', '0104_auto_20201201_1533'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='acttype',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='administrativeact',
+ name='act_object',
+ field=models.TextField(blank=True, default='', verbose_name='Object'),
+ ),
+ migrations.AlterField(
+ model_name='administrativeact',
+ name='departments_label',
+ field=models.TextField(blank=True, default='', help_text='Cached values get from associated departments', verbose_name='Departments'),
+ ),
+ migrations.AlterField(
+ model_name='administrativeact',
+ name='towns_label',
+ field=models.TextField(blank=True, default='', help_text='Cached values get from associated towns', verbose_name='Towns'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='cached_label',
+ field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='cached_periods',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached periods label'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='cached_remains',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached remains label'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='cached_towns_label',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached town label'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='complete_identifier',
+ field=models.TextField(blank=True, default='', verbose_name='Complete identifier'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='discovery_area',
+ field=models.TextField(blank=True, default='', verbose_name='Discovery area'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='locality_cadastral',
+ field=models.TextField(blank=True, default='', verbose_name='Cadastral locality'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='locality_ngi',
+ field=models.TextField(blank=True, default='', verbose_name='National Geographic Institute locality'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='oceanographic_service_localisation',
+ field=models.TextField(blank=True, default='', verbose_name='Oceanographic service localisation'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='other_reference',
+ field=models.TextField(blank=True, default='', verbose_name='Other reference'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='shipwreck_code',
+ field=models.TextField(blank=True, default='', verbose_name='Shipwreck code'),
+ ),
+ migrations.AlterField(
+ model_name='archaeologicalsite',
+ name='shipwreck_name',
+ field=models.TextField(blank=True, default='', verbose_name='Shipwreck name'),
+ ),
+ migrations.AlterField(
+ model_name='culturalattributiontype',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='historicaladministrativeact',
+ name='act_object',
+ field=models.TextField(blank=True, default='', verbose_name='Object'),
+ ),
+ migrations.AlterField(
+ model_name='historicaladministrativeact',
+ name='departments_label',
+ field=models.TextField(blank=True, default='', help_text='Cached values get from associated departments', verbose_name='Departments'),
+ ),
+ migrations.AlterField(
+ model_name='historicaladministrativeact',
+ name='towns_label',
+ field=models.TextField(blank=True, default='', help_text='Cached values get from associated towns', verbose_name='Towns'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='cached_label',
+ field=models.TextField(blank=True, db_index=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached name'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='cached_periods',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached periods label'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='cached_remains',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached remains label'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='cached_towns_label',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached town label'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='complete_identifier',
+ field=models.TextField(blank=True, default='', verbose_name='Complete identifier'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='discovery_area',
+ field=models.TextField(blank=True, default='', verbose_name='Discovery area'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='locality_cadastral',
+ field=models.TextField(blank=True, default='', verbose_name='Cadastral locality'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='locality_ngi',
+ field=models.TextField(blank=True, default='', verbose_name='National Geographic Institute locality'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='oceanographic_service_localisation',
+ field=models.TextField(blank=True, default='', verbose_name='Oceanographic service localisation'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='other_reference',
+ field=models.TextField(blank=True, default='', verbose_name='Other reference'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='shipwreck_code',
+ field=models.TextField(blank=True, default='', verbose_name='Shipwreck code'),
+ ),
+ migrations.AlterField(
+ model_name='historicalarchaeologicalsite',
+ name='shipwreck_name',
+ field=models.TextField(blank=True, default='', verbose_name='Shipwreck name'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='abstract',
+ field=models.TextField(blank=True, default='', verbose_name='Abstract'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='address',
+ field=models.TextField(blank=True, default='', verbose_name='Address / Locality'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='cached_label',
+ field=models.CharField(blank=True, db_index=True, help_text='Generated automatically - do not edit', max_length=500, null=True, verbose_name='Cached name'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='cached_periods',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached periods label'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='cached_remains',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached remains label'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='cached_towns_label',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached town label'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='code_patriarche',
+ field=models.TextField(blank=True, db_index=True, default='', verbose_name='Code PATRIARCHE'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='common_name',
+ field=models.TextField(blank=True, default='', verbose_name='Generic name'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='complete_identifier',
+ field=models.TextField(blank=True, default='', verbose_name='Complete identifier'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='official_report_number',
+ field=models.TextField(blank=True, default='', verbose_name='Official report number'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='scientific_documentation_comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment about scientific documentation'),
+ ),
+ migrations.AlterField(
+ model_name='historicaloperation',
+ name='seizure_name',
+ field=models.TextField(blank=True, default='', verbose_name='Seizure name'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='abstract',
+ field=models.TextField(blank=True, default='', verbose_name='Abstract'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='address',
+ field=models.TextField(blank=True, default='', verbose_name='Address / Locality'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='cached_label',
+ field=models.CharField(blank=True, db_index=True, help_text='Generated automatically - do not edit', max_length=500, null=True, verbose_name='Cached name'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='cached_periods',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached periods label'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='cached_remains',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached remains label'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='cached_towns_label',
+ field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached town label'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='code_patriarche',
+ field=models.TextField(blank=True, default='', unique=True, verbose_name='Code PATRIARCHE'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='common_name',
+ field=models.TextField(blank=True, default='', verbose_name='Generic name'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='complete_identifier',
+ field=models.TextField(blank=True, default='', verbose_name='Complete identifier'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='official_report_number',
+ field=models.TextField(blank=True, default='', verbose_name='Official report number'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='scientific_documentation_comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment about scientific documentation'),
+ ),
+ migrations.AlterField(
+ model_name='operation',
+ name='seizure_name',
+ field=models.TextField(blank=True, default='', verbose_name='Seizure name'),
+ ),
+ migrations.AlterField(
+ model_name='operationtypeold',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='parcel',
+ name='address',
+ field=models.TextField(blank=True, default='', verbose_name='Address - Locality'),
+ ),
+ migrations.AlterField(
+ model_name='parcel',
+ name='cached_label',
+ field=models.TextField(blank=True, db_index=True, default='', verbose_name='Cached name'),
+ ),
+ migrations.AlterField(
+ model_name='period',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='recordqualitytype',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='relationtype',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='remaintype',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ migrations.AlterField(
+ model_name='reportstate',
+ name='comment',
+ field=models.TextField(blank=True, default='', verbose_name='Comment'),
+ ),
+ ]
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index db573a650..cc1231f52 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -310,7 +310,7 @@ class ArchaeologicalSite(DocumentItem, BaseHistorizedItem, CompleteIdentifierIte
reference = models.CharField(_("Reference"), max_length=200, unique=True)
other_reference = models.TextField(_("Other reference"), blank=True,
- null=True)
+ default="")
name = models.CharField(_("Name"), max_length=200,
null=True, blank=True)
periods = models.ManyToManyField(Period, verbose_name=_("Periods"),
@@ -322,28 +322,26 @@ class ArchaeologicalSite(DocumentItem, BaseHistorizedItem, CompleteIdentifierIte
blank=True)
towns = models.ManyToManyField(Town, verbose_name=_("Towns"),
related_name='sites', blank=True)
- comment = models.TextField(_("Comment"), null=True, blank=True)
+ comment = models.TextField(_("Comment"), blank=True, default="")
locality_ngi = models.TextField(
- _("National Geographic Institute locality"),
- null=True, blank=True
- )
- locality_cadastral = models.TextField(_("Cadastral locality"),
- null=True, blank=True)
+ _("National Geographic Institute locality"), blank=True, default="")
+ locality_cadastral = models.TextField(_("Cadastral locality"), blank=True,
+ default="")
collaborators = models.ManyToManyField(
Person, blank=True, verbose_name=_("Collaborators"),
related_name='site_collaborator'
)
# underwater
shipwreck_name = models.TextField(
- _("Shipwreck name"), null=True, blank=True)
+ _("Shipwreck name"), blank=True, default="")
oceanographic_service_localisation = models.TextField(
- _("Oceanographic service localisation"), null=True, blank=True)
+ _("Oceanographic service localisation"), blank=True, default="")
shipwreck_code = models.TextField(
- _("Shipwreck code"), null=True, blank=True)
+ _("Shipwreck code"), blank=True, default="")
sinking_date = models.DateField(
_("Sinking date"), null=True, blank=True)
discovery_area = models.TextField(
- _("Discovery area"), null=True, blank=True)
+ _("Discovery area"), blank=True, default="")
affmar_number = models.CharField(_("AffMar number"), max_length=100,
null=True, blank=True)
drassm_number = models.CharField(_("DRASSM number"), max_length=100,
@@ -357,19 +355,19 @@ class ArchaeologicalSite(DocumentItem, BaseHistorizedItem, CompleteIdentifierIte
on_delete=models.SET_NULL,
verbose_name=_("Main image"), blank=True, null=True)
cached_label = models.TextField(
- _("Cached name"), null=True, blank=True, db_index=True,
+ _("Cached name"), blank=True, default="", db_index=True,
help_text=_("Generated automatically - do not edit")
)
cached_towns_label = models.TextField(
- _("Cached town label"), blank=True, null=True,
+ _("Cached town label"), blank=True, default="",
help_text=_("Generated automatically - do not edit")
)
cached_periods = models.TextField(
- _("Cached periods label"), blank=True, null=True,
+ _("Cached periods label"), blank=True, default="",
help_text=_("Generated automatically - do not edit")
)
cached_remains = models.TextField(
- _("Cached remains label"), blank=True, null=True,
+ _("Cached remains label"), blank=True, default="",
help_text=_("Generated automatically - do not edit")
)
@@ -1099,8 +1097,8 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem,
old_code = models.CharField(_("Old code"), max_length=200, null=True,
blank=True)
## fr
- code_patriarche = models.TextField("Code PATRIARCHE", null=True,
- blank=True, unique=True)
+ code_patriarche = models.TextField(
+ "Code PATRIARCHE", blank=True, default="", unique=True)
# preventive
fnap_financing = models.FloatField("Financement FNAP (%)",
blank=True, null=True)
@@ -1127,11 +1125,11 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem,
## end fr
operator_reference = models.CharField(
_("Operator reference"), max_length=20, null=True, blank=True)
- common_name = models.TextField(_("Generic name"), null=True, blank=True)
- address = models.TextField(_("Address / Locality"), null=True, blank=True)
- comment = models.TextField(_("Comment"), null=True, blank=True)
+ common_name = models.TextField(_("Generic name"), blank=True, default="")
+ address = models.TextField(_("Address / Locality"), blank=True, default="")
+ comment = models.TextField(_("Comment"), blank=True, default="")
scientific_documentation_comment = models.TextField(
- _("Comment about scientific documentation"), null=True, blank=True)
+ _("Comment about scientific documentation"), blank=True, default="")
documents = models.ManyToManyField(
Document, related_name='operations', verbose_name=_("Documents"),
blank=True)
@@ -1159,7 +1157,7 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem,
RecordQualityType, verbose_name=_("Record quality"),
on_delete=models.SET_NULL,
null=True, blank=True,)
- abstract = models.TextField(_("Abstract"), null=True, blank=True)
+ abstract = models.TextField(_("Abstract"), blank=True, default="")
documentation_deadline = models.DateField(
_("Deadline for submission of the documentation"), blank=True,
null=True)
@@ -1174,9 +1172,9 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem,
drassm_code = models.CharField(_("DRASSM code"), max_length=100,
null=True, blank=True)
# judiciary
- seizure_name = models.TextField(_("Seizure name"), blank=True, null=True)
+ seizure_name = models.TextField(_("Seizure name"), blank=True, default="")
official_report_number = models.TextField(_("Official report number"),
- blank=True, null=True)
+ blank=True, default="")
protagonist = models.ForeignKey(
Person, verbose_name=_("Name of the protagonist"),
blank=True, null=True, related_name="operation_protagonist")
@@ -1187,15 +1185,15 @@ class Operation(ClosedItem, DocumentItem, BaseHistorizedItem,
Person, verbose_name=_("Writer of the minutes"),
blank=True, null=True, related_name="minutes_writer")
cached_towns_label = models.TextField(
- _("Cached town label"), blank=True, null=True,
+ _("Cached town label"), blank=True, default="",
help_text=_("Generated automatically - do not edit")
)
cached_periods = models.TextField(
- _("Cached periods label"), blank=True, null=True,
+ _("Cached periods label"), blank=True, default="",
help_text=_("Generated automatically - do not edit")
)
cached_remains = models.TextField(
- _("Cached remains label"), blank=True, null=True,
+ _("Cached remains label"), blank=True, default="",
help_text=_("Generated automatically - do not edit")
)
@@ -2182,16 +2180,15 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
signature_date = models.DateField(_("Signature date"), blank=True,
null=True)
year = models.IntegerField(_("Year"), blank=True, null=True)
- act_object = models.TextField(_("Object"), max_length=300, blank=True,
- null=True)
+ act_object = models.TextField(_("Object"), blank=True, default="")
if settings.COUNTRY == 'fr':
ref_sra = models.CharField("Référence SRA", max_length=15,
blank=True, null=True)
departments_label = models.TextField(
- _("Departments"), blank=True, null=True,
+ _("Departments"), blank=True, default="",
help_text=_("Cached values get from associated departments"))
towns_label = models.TextField(
- _("Towns"), blank=True, null=True,
+ _("Towns"), blank=True, default="",
help_text=_("Cached values get from associated towns"))
history = HistoricalRecords()
_prefix = 'adminact_'
@@ -2425,8 +2422,8 @@ class Parcel(LightHistorizedItem):
null=True, blank=True)
auto_external_id = models.BooleanField(
_("External ID is set automatically"), default=False)
- address = models.TextField(_("Address - Locality"), null=True, blank=True)
- cached_label = models.TextField(_("Cached name"), null=True, blank=True,
+ address = models.TextField(_("Address - Locality"), blank=True, default="")
+ cached_label = models.TextField(_("Cached name"), blank=True, default="",
db_index=True)
class Meta: