diff options
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/migrations/0107_auto_20201203_1453.py | 486 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 130 | ||||
| -rw-r--r-- | archaeological_finds/models_treatments.py | 18 |
3 files changed, 564 insertions, 70 deletions
diff --git a/archaeological_finds/migrations/0107_auto_20201203_1453.py b/archaeological_finds/migrations/0107_auto_20201203_1453.py new file mode 100644 index 000000000..f28eb17b1 --- /dev/null +++ b/archaeological_finds/migrations/0107_auto_20201203_1453.py @@ -0,0 +1,486 @@ +# -*- 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_finds', '0106_auto_20201201_1534'), + ] + + operations = [ + migrations.AlterField( + model_name='alterationcausetype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='alterationtype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='basefind', + name='cache_complete_id', + field=models.TextField(blank=True, db_index=True, default='', help_text='Cached value - do not edit', verbose_name='Complete ID'), + ), + migrations.AlterField( + model_name='basefind', + name='cache_short_id', + field=models.TextField(blank=True, db_index=True, default='', help_text='Cached value - do not edit', verbose_name='Short ID'), + ), + migrations.AlterField( + model_name='basefind', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='basefind', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AlterField( + model_name='basefind', + name='description', + field=models.TextField(blank=True, default='', verbose_name='Description'), + ), + migrations.AlterField( + model_name='basefind', + name='excavation_id', + field=models.TextField(blank=True, default='', verbose_name='Excavation ID'), + ), + migrations.AlterField( + model_name='basefind', + name='external_id', + field=models.TextField(blank=True, default='', verbose_name='External ID'), + ), + migrations.AlterField( + model_name='basefind', + name='special_interest', + field=models.CharField(blank=True, default='', max_length=120, verbose_name='Special interest'), + ), + migrations.AlterField( + model_name='batchtype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='checkedtype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='communicabilitytype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='conservatorystate', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='find', + 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='find', + name='cached_materials', + field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached material types label'), + ), + migrations.AlterField( + model_name='find', + name='cached_object_types', + field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached object types label'), + ), + migrations.AlterField( + model_name='find', + 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='find', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='find', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AlterField( + model_name='find', + name='conservatory_comment', + field=models.TextField(blank=True, default='', verbose_name='Conservatory comment'), + ), + migrations.AlterField( + model_name='find', + name='dating_comment', + field=models.TextField(blank=True, default='', verbose_name='Comment on dating'), + ), + migrations.AlterField( + model_name='find', + name='decoration', + field=models.TextField(blank=True, default='', verbose_name='Decoration'), + ), + migrations.AlterField( + model_name='find', + name='denomination', + field=models.TextField(blank=True, default='', verbose_name='Denomination'), + ), + migrations.AlterField( + model_name='find', + name='description', + field=models.TextField(blank=True, default='', verbose_name='Description'), + ), + migrations.AlterField( + model_name='find', + name='dimensions_comment', + field=models.TextField(blank=True, default='', verbose_name='Dimensions comment'), + ), + migrations.AlterField( + model_name='find', + name='external_id', + field=models.TextField(blank=True, default='', verbose_name='External ID'), + ), + migrations.AlterField( + model_name='find', + name='inscription', + field=models.TextField(blank=True, default='', verbose_name='Inscription'), + ), + migrations.AlterField( + model_name='find', + name='laboratory_id', + field=models.TextField(blank=True, default='', verbose_name='Laboratory ID'), + ), + migrations.AlterField( + model_name='find', + name='manufacturing_place', + field=models.TextField(blank=True, default='', verbose_name='Manufacturing place'), + ), + migrations.AlterField( + model_name='find', + name='mark', + field=models.TextField(blank=True, default='', verbose_name='Mark'), + ), + migrations.AlterField( + model_name='find', + name='material_comment', + field=models.TextField(blank=True, default='', verbose_name='Comment on the material'), + ), + migrations.AlterField( + model_name='find', + name='museum_id', + field=models.TextField(blank=True, default='', verbose_name='Museum ID'), + ), + migrations.AlterField( + model_name='find', + name='previous_id', + field=models.TextField(blank=True, default='', verbose_name='Previous ID'), + ), + migrations.AlterField( + model_name='find', + name='public_description', + field=models.TextField(blank=True, default='', verbose_name='Public description'), + ), + migrations.AlterField( + model_name='find', + name='seal_number', + field=models.TextField(blank=True, default='', verbose_name='Seal number'), + ), + migrations.AlterField( + model_name='findbasket', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='cache_complete_id', + field=models.TextField(blank=True, db_index=True, default='', help_text='Cached value - do not edit', verbose_name='Complete ID'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='cache_short_id', + field=models.TextField(blank=True, db_index=True, default='', help_text='Cached value - do not edit', verbose_name='Short ID'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='description', + field=models.TextField(blank=True, default='', verbose_name='Description'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='excavation_id', + field=models.TextField(blank=True, default='', verbose_name='Excavation ID'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='external_id', + field=models.TextField(blank=True, default='', verbose_name='External ID'), + ), + migrations.AlterField( + model_name='historicalbasefind', + name='special_interest', + field=models.CharField(blank=True, default='', max_length=120, verbose_name='Special interest'), + ), + migrations.AlterField( + model_name='historicalfind', + 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='historicalfind', + name='cached_materials', + field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached material types label'), + ), + migrations.AlterField( + model_name='historicalfind', + name='cached_object_types', + field=models.TextField(blank=True, default='', help_text='Generated automatically - do not edit', verbose_name='Cached object types label'), + ), + migrations.AlterField( + model_name='historicalfind', + 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='historicalfind', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='historicalfind', + name='complete_identifier', + field=models.TextField(blank=True, default='', verbose_name='Complete identifier'), + ), + migrations.AlterField( + model_name='historicalfind', + name='conservatory_comment', + field=models.TextField(blank=True, default='', verbose_name='Conservatory comment'), + ), + migrations.AlterField( + model_name='historicalfind', + name='dating_comment', + field=models.TextField(blank=True, default='', verbose_name='Comment on dating'), + ), + migrations.AlterField( + model_name='historicalfind', + name='decoration', + field=models.TextField(blank=True, default='', verbose_name='Decoration'), + ), + migrations.AlterField( + model_name='historicalfind', + name='denomination', + field=models.TextField(blank=True, default='', verbose_name='Denomination'), + ), + migrations.AlterField( + model_name='historicalfind', + name='description', + field=models.TextField(blank=True, default='', verbose_name='Description'), + ), + migrations.AlterField( + model_name='historicalfind', + name='dimensions_comment', + field=models.TextField(blank=True, default='', verbose_name='Dimensions comment'), + ), + migrations.AlterField( + model_name='historicalfind', + name='external_id', + field=models.TextField(blank=True, default='', verbose_name='External ID'), + ), + migrations.AlterField( + model_name='historicalfind', + name='inscription', + field=models.TextField(blank=True, default='', verbose_name='Inscription'), + ), + migrations.AlterField( + model_name='historicalfind', + name='laboratory_id', + field=models.TextField(blank=True, default='', verbose_name='Laboratory ID'), + ), + migrations.AlterField( + model_name='historicalfind', + name='manufacturing_place', + field=models.TextField(blank=True, default='', verbose_name='Manufacturing place'), + ), + migrations.AlterField( + model_name='historicalfind', + name='mark', + field=models.TextField(blank=True, default='', verbose_name='Mark'), + ), + migrations.AlterField( + model_name='historicalfind', + name='material_comment', + field=models.TextField(blank=True, default='', verbose_name='Comment on the material'), + ), + migrations.AlterField( + model_name='historicalfind', + name='museum_id', + field=models.TextField(blank=True, default='', verbose_name='Museum ID'), + ), + migrations.AlterField( + model_name='historicalfind', + name='previous_id', + field=models.TextField(blank=True, default='', verbose_name='Previous ID'), + ), + migrations.AlterField( + model_name='historicalfind', + name='public_description', + field=models.TextField(blank=True, default='', verbose_name='Public description'), + ), + migrations.AlterField( + model_name='historicalfind', + name='seal_number', + field=models.TextField(blank=True, default='', verbose_name='Seal number'), + ), + migrations.AlterField( + model_name='historicaltreatment', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='historicaltreatment', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='historicaltreatment', + name='description', + field=models.TextField(blank=True, default='', verbose_name='Description'), + ), + migrations.AlterField( + model_name='historicaltreatment', + name='goal', + field=models.TextField(blank=True, default='', verbose_name='Goal'), + ), + migrations.AlterField( + model_name='historicaltreatmentfile', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='historicaltreatmentfile', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='historicaltreatmentfile', + name='exhibition_name', + field=models.TextField(blank=True, default='', verbose_name='Exhibition name'), + ), + migrations.AlterField( + model_name='historicaltreatmentfile', + name='name', + field=models.TextField(blank=True, default='', verbose_name='Name'), + ), + migrations.AlterField( + model_name='integritytype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='materialtype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='materialtype', + name='recommendation', + field=models.TextField(blank=True, default='', verbose_name='Recommendation'), + ), + migrations.AlterField( + model_name='materialtypequalitytype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='objecttype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='objecttypequalitytype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='remarkabilitytype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='treatment', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='treatment', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='treatment', + name='description', + field=models.TextField(blank=True, default='', verbose_name='Description'), + ), + migrations.AlterField( + model_name='treatment', + name='goal', + field=models.TextField(blank=True, default='', verbose_name='Goal'), + ), + migrations.AlterField( + model_name='treatmentemergencytype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='treatmentfile', + name='cached_label', + field=models.TextField(blank=True, db_index=True, default='', verbose_name='Cached name'), + ), + migrations.AlterField( + model_name='treatmentfile', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='treatmentfile', + name='exhibition_name', + field=models.TextField(blank=True, default='', verbose_name='Exhibition name'), + ), + migrations.AlterField( + model_name='treatmentfile', + name='name', + field=models.TextField(blank=True, default='', verbose_name='Name'), + ), + migrations.AlterField( + model_name='treatmentfiletype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='treatmentstate', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + migrations.AlterField( + model_name='treatmenttype', + name='comment', + field=models.TextField(blank=True, default='', verbose_name='Comment'), + ), + ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 494bb8a97..5bb06fd24 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -58,8 +58,8 @@ from archaeological_warehouse.models import Warehouse class MaterialType(HierarchicalType): code = models.CharField(_("Code"), max_length=100, blank=True, null=True) - recommendation = models.TextField(_("Recommendation"), blank=True, - null=True) + recommendation = models.TextField( + _("Recommendation"), blank=True, default="") class Meta: verbose_name = _("Material type") @@ -277,18 +277,20 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, GeoItem, EXTERNAL_ID_DEPENDENCIES = ['find'] SLUG = 'basefind' uuid = models.UUIDField(default=uuid.uuid4) - label = models.TextField(_(u"Free ID")) - external_id = models.TextField(_(u"External ID"), blank=True, null=True) + label = models.TextField(_("Free ID")) + external_id = models.TextField(_("External ID"), blank=True, default="") auto_external_id = models.BooleanField( - _(u"External ID is set automatically"), default=False) - excavation_id = models.TextField(_(u"Excavation ID"), blank=True, null=True) - description = models.TextField(_(u"Description"), blank=True, null=True) - comment = models.TextField(_(u"Comment"), blank=True, null=True) - special_interest = models.CharField(_(u"Special interest"), blank=True, - null=True, max_length=120) + _("External ID is set automatically"), default=False) + excavation_id = models.TextField( + _("Excavation ID"), blank=True, default="") + description = models.TextField( + _("Description"), blank=True, default="") + comment = models.TextField(_("Comment"), blank=True, default="") + special_interest = models.CharField( + _("Special interest"), blank=True, default="", max_length=120) context_record = models.ForeignKey( ContextRecord, related_name='base_finds', - verbose_name=_(u"Context Record")) + verbose_name=_("Context Record")) discovery_date = models.DateField(_(u"Discovery date (exact or TPQ)"), blank=True, null=True) discovery_date_taq = models.DateField(_(u"Discovery date (TAQ)"), @@ -304,11 +306,11 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, GeoItem, # gis line = models.LineStringField(_(u"Line"), blank=True, null=True) cache_short_id = models.TextField( - _(u"Short ID"), blank=True, null=True, db_index=True, - help_text=_(u"Cached value - do not edit")) + _("Short ID"), blank=True, default="", db_index=True, + help_text=_("Cached value - do not edit")) cache_complete_id = models.TextField( - _(u"Complete ID"), blank=True, null=True, db_index=True, - help_text=_(u"Cached value - do not edit")) + _("Complete ID"), blank=True, default="", db_index=True, + help_text=_("Cached value - do not edit")) history = HistoricalRecords() RELATED_POST_PROCESS = ['find'] CACHED_LABELS = ['cache_short_id', 'cache_complete_id'] @@ -1497,25 +1499,29 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, # fields uuid = models.UUIDField(default=uuid.uuid4) - base_finds = models.ManyToManyField(BaseFind, verbose_name=_(u"Base find"), + base_finds = models.ManyToManyField(BaseFind, verbose_name=_("Base find"), related_name='find') - external_id = models.TextField(_(u"External ID"), blank=True, null=True) + external_id = models.TextField(_("External ID"), blank=True, default="") auto_external_id = models.BooleanField( - _(u"External ID is set automatically"), default=False) + _("External ID is set automatically"), default=False) # judiciary operation - seal_number = models.TextField( - _(u"Seal number"), blank=True, null=True - ) - order = models.IntegerField(_(u"Order"), default=1) - label = models.TextField(_(u"Free ID")) - denomination = models.TextField(_(u"Denomination"), blank=True, null=True) - museum_id = models.TextField(_(u"Museum ID"), blank=True, null=True) - laboratory_id = models.TextField(_("Laboratory ID"), blank=True, null=True) - description = models.TextField(_(u"Description"), blank=True, null=True) - decoration = models.TextField(_(u"Decoration"), blank=True, null=True) - inscription = models.TextField(_(u"Inscription"), blank=True, null=True) + seal_number = models.TextField(_("Seal number"), blank=True, default="") + order = models.IntegerField(_("Order"), default=1) + label = models.TextField(_("Free ID")) + denomination = models.TextField( + _("Denomination"), blank=True, default="") + museum_id = models.TextField( + _("Museum ID"), blank=True, default="") + laboratory_id = models.TextField( + _("Laboratory ID"), blank=True, default="") + description = models.TextField( + _("Description"), blank=True, default="") + decoration = models.TextField( + _("Decoration"), blank=True, default="") + inscription = models.TextField( + _("Inscription"), blank=True, default="") manufacturing_place = models.TextField( - _(u"Manufacturing place"), blank=True, null=True) + _("Manufacturing place"), blank=True, default="") material_types = models.ManyToManyField( MaterialType, verbose_name=_(u"Material types"), related_name='finds', blank=True @@ -1526,8 +1532,8 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, on_delete=models.SET_NULL, blank=True, null=True ) - material_comment = models.TextField(_(u"Comment on the material"), - blank=True, null=True) + material_comment = models.TextField( + _("Comment on the material"), blank=True, default="") volume = models.FloatField(_(u"Volume (l)"), blank=True, null=True) weight = models.FloatField(_(u"Weight"), blank=True, null=True) weight_unit = models.CharField(_(u"Weight unit"), max_length=4, @@ -1588,20 +1594,20 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, _(u"Clutter - short side (cm)"), blank=True, null=True) clutter_height = models.FloatField( _(u"Clutter - height (cm)"), blank=True, null=True) - dimensions_comment = models.TextField(_(u"Dimensions comment"), - blank=True, null=True) - mark = models.TextField(_(u"Mark"), blank=True, null=True) - comment = models.TextField(_(u"Comment"), blank=True, null=True) - dating_comment = models.TextField(_(u"Comment on dating"), blank=True, - null=True) - previous_id = models.TextField(_(u"Previous ID"), blank=True, null=True) - index = models.IntegerField(u"Index", default=0) - checked_type = models.ForeignKey(CheckedType, verbose_name=_(u"Check"), + dimensions_comment = models.TextField( + _("Dimensions comment"), blank=True, default="") + mark = models.TextField(_("Mark"), blank=True, default="") + comment = models.TextField(_("Comment"), blank=True, default="") + dating_comment = models.TextField(_("Comment on dating"), blank=True, + default="") + previous_id = models.TextField(_("Previous ID"), blank=True, default="") + index = models.IntegerField("Index", default=0) + checked_type = models.ForeignKey(CheckedType, verbose_name=_("Check"), on_delete=models.SET_NULL, blank=True, null=True) - check_date = models.DateField(_(u"Check date"), + check_date = models.DateField(_("Check date"), default=datetime.date.today) - estimated_value = models.FloatField(_(u"Estimated value"), blank=True, + estimated_value = models.FloatField(_("Estimated value"), blank=True, null=True) collection = models.ForeignKey( "archaeological_warehouse.Warehouse", verbose_name=_("Collection"), @@ -1609,24 +1615,24 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, # preservation module conservatory_state = models.ForeignKey( - ConservatoryState, verbose_name=_(u"Conservatory state"), blank=True, + ConservatoryState, verbose_name=_("Conservatory state"), blank=True, null=True, on_delete=models.SET_NULL) - conservatory_comment = models.TextField(_(u"Conservatory comment"), - blank=True, null=True) + conservatory_comment = models.TextField(_("Conservatory comment"), + blank=True, default="") preservation_to_considers = models.ManyToManyField( TreatmentType, - verbose_name=_(u"Recommended treatments"), + verbose_name=_("Recommended treatments"), related_name='finds_recommended', blank=True) alterations = models.ManyToManyField( - AlterationType, verbose_name=_(u"Alteration"), blank=True, + AlterationType, verbose_name=_("Alteration"), blank=True, related_name='finds' ) alteration_causes = models.ManyToManyField( - AlterationCauseType, verbose_name=_(u"Alteration cause"), blank=True, + AlterationCauseType, verbose_name=_("Alteration cause"), blank=True, related_name='finds' ) treatment_emergency = models.ForeignKey( - TreatmentEmergencyType, verbose_name=_(u"Treatment emergency"), + TreatmentEmergencyType, verbose_name=_("Treatment emergency"), on_delete=models.SET_NULL, blank=True, null=True ) @@ -1634,31 +1640,33 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, null=True) appraisal_date = models.DateField(_("Appraisal date"), blank=True, null=True) - public_description = models.TextField(_("Public description"), blank=True, - null=True) + public_description = models.TextField( + _("Public description"), blank=True, default="") documents = models.ManyToManyField( - Document, related_name='finds', verbose_name=_(u"Documents"), + Document, related_name='finds', verbose_name=_("Documents"), blank=True) main_image = models.ForeignKey( Document, related_name='main_image_finds', on_delete=models.SET_NULL, - verbose_name=_(u"Main image"), blank=True, null=True) + verbose_name=_("Main image"), blank=True, null=True) treatments = models.ManyToManyField( - "Treatment", verbose_name=_(u"Treatments"), + "Treatment", verbose_name=_("Treatments"), related_name='finds', blank=True, - help_text=_(u"Related treatments when no new find is created")) - cached_label = models.TextField(_(u"Cached name"), null=True, blank=True, - db_index=True) + help_text=_("Related treatments when no new find is created")) + cached_label = models.TextField( + _("Cached name"), blank=True, default="", db_index=True, + 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_object_types = models.TextField( - _("Cached object types label"), blank=True, null=True, + _("Cached object types label"), blank=True, default="", help_text=_("Generated automatically - do not edit") ) cached_materials = models.TextField( - _("Cached material types label"), blank=True, null=True, + _("Cached material types label"), blank=True, default="", help_text=_("Generated automatically - do not edit") ) history = HistoricalRecords(bases=[HistoryModel]) diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 2bfe8d2cb..3f1c14069 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -195,9 +195,9 @@ class Treatment(DashboardFormItem, ValueGetter, DocumentItem, on_delete=models.SET_NULL, related_name='treatments') external_id = models.CharField(_(u"External ID"), blank=True, null=True, max_length=200) - comment = models.TextField(_(u"Comment"), blank=True, null=True) - description = models.TextField(_(u"Description"), blank=True, null=True) - goal = models.TextField(_(u"Goal"), blank=True, null=True) + comment = models.TextField(_("Comment"), blank=True, default="") + description = models.TextField(_("Description"), blank=True, default="") + goal = models.TextField(_("Goal"), blank=True, default="") start_date = models.DateField(_(u"Start date"), blank=True, null=True) end_date = models.DateField(_(u"Closing date"), blank=True, null=True) creation_date = models.DateTimeField(default=datetime.datetime.now) @@ -219,7 +219,7 @@ class Treatment(DashboardFormItem, ValueGetter, DocumentItem, Document, related_name='main_image_treatments', on_delete=models.SET_NULL, verbose_name=_(u"Main image"), blank=True, null=True) - cached_label = models.TextField(_(u"Cached name"), null=True, blank=True, + cached_label = models.TextField(_("Cached name"), blank=True, default="", db_index=True) history = HistoricalRecords(bases=[HistoryModel]) @@ -991,7 +991,7 @@ class TreatmentFile(DashboardFormItem, ClosedItem, DocumentItem, null=True, max_length=200) external_id = models.CharField(_(u"External ID"), blank=True, null=True, max_length=200) - name = models.TextField(_(u"Name"), blank=True, null=True) + name = models.TextField(_("Name"), blank=True, default="") type = models.ForeignKey(TreatmentFileType, verbose_name=_(u"Treatment request type")) in_charge = models.ForeignKey( @@ -1013,14 +1013,14 @@ class TreatmentFile(DashboardFormItem, ClosedItem, DocumentItem, reception_date = models.DateField(_(u'Reception date'), blank=True, null=True) # exhibition - exhibition_name = models.TextField(_("Exhibition name"), - blank=True, null=True) + exhibition_name = models.TextField(_("Exhibition name"), blank=True, + default="") exhibition_start_date = models.DateField(_("Exhibition start date"), blank=True, null=True) exhibition_end_date = models.DateField(_("Exhibition end date"), blank=True, null=True) - comment = models.TextField(_(u"Comment"), null=True, blank=True) + comment = models.TextField(_("Comment"), blank=True, default="") documents = models.ManyToManyField( Document, related_name='treatment_files', verbose_name=_(u"Documents"), blank=True) @@ -1032,7 +1032,7 @@ class TreatmentFile(DashboardFormItem, ClosedItem, DocumentItem, FindBasket, null=True, blank=True, on_delete=models.SET_NULL, related_name='treatment_files' ) - cached_label = models.TextField(_(u"Cached name"), null=True, blank=True, + cached_label = models.TextField(_("Cached name"), blank=True, default="", db_index=True) history = HistoricalRecords() |