TextField: blank=True, null=True -> blank=True, default=""

1 files changed, 69 insertions, 61 deletions

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])