diff options
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/migrations/0106_auto_20201203_1453.py | 146 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 16 |
2 files changed, 154 insertions, 8 deletions
diff --git a/archaeological_warehouse/migrations/0106_auto_20201203_1453.py b/archaeological_warehouse/migrations/0106_auto_20201203_1453.py new file mode 100644 index 000000000..f49debe61 --- /dev/null +++ b/archaeological_warehouse/migrations/0106_auto_20201203_1453.py @@ -0,0 +1,146 @@ +# -*- 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_warehouse', '0105_auto_20201201_1534'), + ] + + operations = [ + migrations.AlterField( + model_name='container', + name='cached_division', + field=models.TextField(blank=True, db_index=True, default='', verbose_name='Cached division'), + ), + migrations.AlterField( + model_name='container', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', verbose_name='Localisation'), + ), + migrations.AlterField( + model_name='container', + name='cached_location', + field=models.TextField(blank=True, db_index=True, default='', verbose_name='Cached location'), + ), + migrations.AlterField( + model_name='container', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='container', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AlterField( + model_name='container', + name='external_id', + field=models.TextField(blank=True, default='', verbose_name='External ID'), + ), + migrations.AlterField( + model_name='container', + name='old_reference', + field=models.TextField(blank=True, default='', verbose_name='Old reference'), + ), + migrations.AlterField( + model_name='containertype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='address', + field=models.TextField(blank=True, default='', verbose_name='Address'), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='address_complement', + field=models.TextField(blank=True, default='', verbose_name='Address complement'), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='alt_address', + field=models.TextField(blank=True, default='', verbose_name='Other address: address'), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='alt_address_complement', + field=models.TextField(blank=True, default='', verbose_name='Other address: address complement'), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='external_id', + field=models.TextField(blank=True, default='', verbose_name='External ID'), + ), + migrations.AlterField( + model_name='historicalwarehouse', + name='raw_phone', + field=models.TextField(blank=True, default='', verbose_name='Raw phone'), + ), + migrations.AlterField( + model_name='warehouse', + name='address', + field=models.TextField(blank=True, default='', verbose_name='Address'), + ), + migrations.AlterField( + model_name='warehouse', + name='address_complement', + field=models.TextField(blank=True, default='', verbose_name='Address complement'), + ), + migrations.AlterField( + model_name='warehouse', + name='alt_address', + field=models.TextField(blank=True, default='', verbose_name='Other address: address'), + ), + migrations.AlterField( + model_name='warehouse', + name='alt_address_complement', + field=models.TextField(blank=True, default='', verbose_name='Other address: address complement'), + ), + migrations.AlterField( + model_name='warehouse', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='warehouse', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AlterField( + model_name='warehouse', + name='external_id', + field=models.TextField(blank=True, default='', verbose_name='External ID'), + ), + migrations.AlterField( + model_name='warehouse', + name='raw_phone', + field=models.TextField(blank=True, default='', verbose_name='Raw phone'), + ), + migrations.AlterField( + model_name='warehousedivision', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='warehousetype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + ] diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 872cc1d68..031f04ed4 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -319,7 +319,7 @@ class Warehouse(Address, DocumentItem, GeoItem, CompleteIdentifierItem, "ishtar_common.Organization", blank=True, null=True, related_name='warehouses', verbose_name=_("Organization"), on_delete=models.SET_NULL) - comment = models.TextField(_("Comment"), null=True, blank=True) + comment = models.TextField(_("Comment"), blank=True, default="") associated_divisions = models.ManyToManyField( 'WarehouseDivision', verbose_name=_("Divisions"), blank=True, through='WarehouseDivisionLink' @@ -332,7 +332,7 @@ class Warehouse(Address, DocumentItem, GeoItem, CompleteIdentifierItem, "ishtar_common.Document", related_name='main_image_warehouses', on_delete=models.SET_NULL, verbose_name=_("Main image"), blank=True, null=True) - external_id = models.TextField(_("External ID"), blank=True, null=True) + external_id = models.TextField(_("External ID"), blank=True, default="") auto_external_id = models.BooleanField( _("External ID is set automatically"), default=False) max_division_number = models.IntegerField( @@ -853,19 +853,19 @@ class Container(DocumentItem, Merge, LightHistorizedItem, verbose_name=_("Container type"), related_name="containers") reference = models.TextField(_("Container ref.")) - comment = models.TextField(_("Comment"), null=True, blank=True) - cached_label = models.TextField(_("Localisation"), null=True, blank=True, + comment = models.TextField(_("Comment"), blank=True, default="") + cached_label = models.TextField(_("Localisation"), blank=True, default="", db_index=True) cached_location = models.TextField(_("Cached location"), - null=True, blank=True, db_index=True) + blank=True, default="", db_index=True) cached_division = models.TextField(_("Cached division"), - null=True, blank=True, db_index=True) + blank=True, default="", db_index=True) parent = models.ForeignKey("Container", verbose_name=_("Parent container"), on_delete=models.SET_NULL, related_name="children", blank=True, null=True) index = models.IntegerField(_("Container ID"), default=0) - old_reference = models.TextField(_("Old reference"), blank=True, null=True) - external_id = models.TextField(_("External ID"), blank=True, null=True) + old_reference = models.TextField(_("Old reference"), blank=True, default="") + external_id = models.TextField(_("External ID"), blank=True, default="") auto_external_id = models.BooleanField( _("External ID is set automatically"), default=False) documents = models.ManyToManyField( |