diff options
| 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 | 
| commit | d9844aa5f16efbdf82516bc00d473410bfe729f5 (patch) | |
| tree | cd95c65028eeac282b12d435e4a5c44045123575 /ishtar_common/models.py | |
| parent | 1a86dfe4ab25013f64f6028d8e09cc0ce0a1fcd8 (diff) | |
| download | Ishtar-d9844aa5f16efbdf82516bc00d473410bfe729f5.tar.bz2 Ishtar-d9844aa5f16efbdf82516bc00d473410bfe729f5.zip | |
TextField: blank=True, null=True -> blank=True, default=""
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 60 | 
1 files changed, 30 insertions, 30 deletions
| diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 38e6a7d17..b728b5387 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -664,8 +664,8 @@ def post_delete_record_relation(sender, instance, **kwargs):  class SearchQuery(models.Model): -    label = models.TextField(_("Label"), blank=True) -    query = models.TextField(_("Query"), blank=True) +    label = models.TextField(_("Label"), blank=True, default="") +    query = models.TextField(_("Query"), blank=True, default="")      content_type = models.ForeignKey(ContentType,                                       verbose_name=_("Content type"))      profile = models.ForeignKey("UserProfile", verbose_name=_("Profile")) @@ -736,9 +736,10 @@ class IshtarSiteProfile(models.Model, Cached):      active = models.BooleanField(_("Current active"), default=False)      experimental_feature = models.BooleanField(          _("Activate experimental feature"), default=False) -    description = models.TextField(_("Description"), null=True, blank=True) -    warning_name = models.TextField(_("Warning name"), blank=True) -    warning_message = models.TextField(_("Warning message"), blank=True) +    description = models.TextField(_("Description"), blank=True, default="") +    warning_name = models.TextField(_("Warning name"), blank=True, default="") +    warning_message = models.TextField(_("Warning message"), blank=True, +                                       default="")      config = models.CharField(          _("Alternate configuration"), max_length=200,          choices=ALTERNATE_CONFIGS_CHOICES, @@ -791,7 +792,7 @@ class IshtarSiteProfile(models.Model, Cached):      parcel_mandatory = models.BooleanField(          _("Parcel are mandatory for context records"), default=True)      homepage = models.TextField( -        _("Home page"), null=True, blank=True, +        _("Home page"), blank=True, default="",          help_text=_("Homepage of Ishtar - if not defined a default homepage "                      "will appear. Use the markdown syntax. {random_image} "                      "can be used to display a random image.")) @@ -1230,7 +1231,7 @@ class CustomFormJsonField(models.Model):      label = models.CharField(_("Label"), max_length=200, blank=True,                               default='')      order = models.IntegerField(verbose_name=_("Order"), default=1) -    help_text = models.TextField(_("Help"), blank=True, null=True) +    help_text = models.TextField(_("Help"), blank=True, default="")      objects = CustomFormJsonFieldManager()      class Meta: @@ -1248,9 +1249,9 @@ class CustomFormJsonField(models.Model):  class GlobalVar(models.Model, Cached):      slug = models.SlugField(_("Variable name"), unique=True) -    description = models.TextField(_("Description of the variable"), -                                   null=True, blank=True) -    value = models.TextField(_("Value"), null=True, blank=True) +    description = models.TextField( +        _("Description of the variable"), blank=True, default="") +    value = models.TextField(_("Value"), blank=True, default="")      objects = SlugModelManager()      class Meta: @@ -1705,7 +1706,7 @@ class Organization(Address, Merge, OwnPerms, ValueGetter, MainItem):      organization_type = models.ForeignKey(OrganizationType,                                            verbose_name=_("Type"))      url = models.URLField(verbose_name=_("Web address"), blank=True, null=True) -    cached_label = models.TextField(_("Cached name"), null=True, blank=True, +    cached_label = models.TextField(_("Cached name"), blank=True, default="",                                      db_index=True)      DOWN_MODEL_UPDATE = ['members'] @@ -1927,12 +1928,12 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem):                                  null=True)      contact_type = models.CharField(_("Contact type"), max_length=300,                                      blank=True, null=True) -    comment = models.TextField(_("Comment"), blank=True, null=True) +    comment = models.TextField(_("Comment"), blank=True, default="")      person_types = models.ManyToManyField(PersonType, verbose_name=_("Types"))      attached_to = models.ForeignKey(          'Organization', related_name='members', on_delete=models.SET_NULL,          verbose_name=_("Is attached to"), blank=True, null=True) -    cached_label = models.TextField(_("Cached name"), null=True, blank=True, +    cached_label = models.TextField(_("Cached name"), blank=True, default="",                                      db_index=True)      DOWN_MODEL_UPDATE = ["author"] @@ -2424,7 +2425,7 @@ class Basket(FullSearch, OwnPerms, ValueGetter, TemplateItem):      IS_BASKET = True      uuid = models.UUIDField(default=uuid.uuid4)      label = models.CharField(_("Label"), max_length=1000) -    comment = models.TextField(_("Comment"), blank=True, null=True) +    comment = models.TextField(_("Comment"), blank=True, default="")      slug = models.SlugField(_("Slug"), blank=True, null=True)      public = models.BooleanField(_("Public"), default=False)      user = models.ForeignKey( @@ -2555,7 +2556,7 @@ class Author(FullSearch):      person = models.ForeignKey(Person, verbose_name=_("Person"),                                 related_name='author')      author_type = models.ForeignKey(AuthorType, verbose_name=_("Author type")) -    cached_label = models.TextField(_("Cached name"), null=True, blank=True, +    cached_label = models.TextField(_("Cached name"), blank=True, default="",                                      db_index=True)      objects = UUIDModelManager() @@ -3013,10 +3014,10 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,          help_text=max_size_help())      index = models.IntegerField(verbose_name=_("Index"), blank=True,                                  null=True) -    external_id = models.TextField(_("External ID"), null=True, blank=True) -    reference = models.TextField(_("Ref."), null=True, blank=True) -    internal_reference = models.TextField(_("Internal ref."), null=True, -                                          blank=True) +    external_id = models.TextField(_("External ID"), blank=True, default="") +    reference = models.TextField(_("Ref."), blank=True, default="") +    internal_reference = models.TextField(_("Internal ref."), blank=True, +                                          default="")      source_type = models.ForeignKey(SourceType, verbose_name=_("Type"),                                      on_delete=models.SET_NULL,                                      null=True, blank=True) @@ -3062,22 +3063,22 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,          blank=True, null=True,          verbose_name=_("Receipt date in documentation"))      item_number = models.IntegerField(_("Number of items"), default=1) -    description = models.TextField(_("Description"), blank=True, null=True) +    description = models.TextField(_("Description"), blank=True, default="")      container_id = models.PositiveIntegerField(          verbose_name=_("Container ID"), blank=True, null=True)      # container = models.ForeignKey("archaeological_warehouse.Container")      container_ref_id = models.PositiveIntegerField(          verbose_name=_("Container ID"), blank=True, null=True)      # container_ref = models.ForeignKey("archaeological_warehouse.Container") -    comment = models.TextField(_("Comment"), blank=True, null=True) +    comment = models.TextField(_("Comment"), blank=True, default="")      additional_information = models.TextField(_("Additional information"), -                                              blank=True, null=True) +                                              blank=True, default="")      duplicate = models.NullBooleanField(_("Has a duplicate"), blank=True,                                          null=True)      associated_links = models.TextField(_("Symbolic links"), blank=True, -                                        null=True) +                                        default="")      cache_related_label = models.TextField( -        _("Related"), blank=True, null=True, db_index=True, +        _("Related"), blank=True, default="", db_index=True,          help_text=_("Cached value - do not edit"))      class Meta: @@ -3751,8 +3752,7 @@ post_delete.connect(post_save_cache, sender=OperationType)  class AdministrationScript(models.Model):      path = models.CharField(_("Filename"), max_length=30) -    name = models.TextField(_("Name"), -                            null=True, blank=True) +    name = models.TextField(_("Name"), blank=True, default="")      class Meta:          verbose_name = _("Administration script") @@ -3779,7 +3779,7 @@ class AdministrationTask(models.Model):      creation_date = models.DateTimeField(default=datetime.datetime.now)      launch_date = models.DateTimeField(null=True, blank=True)      finished_date = models.DateTimeField(null=True, blank=True) -    result = models.TextField(_("Result"), null=True, blank=True) +    result = models.TextField(_("Result"), blank=True, default="")      class Meta:          verbose_name = _("Administration task") @@ -3886,7 +3886,7 @@ class ExportTask(models.Model):          _("Filter on"), max_length=2, choices=ITEM_TYPES, null=True, blank=True      )      filter_text = models.TextField( -        _("Filter query"), null=True, blank=True, +        _("Filter query"), blank=True, default="",          help_text=_("Textual query on this item (try it on the main "                      "interface)"))      geo = models.BooleanField( @@ -3917,8 +3917,8 @@ class ExportTask(models.Model):      finished_date = models.DateTimeField(null=True, blank=True)      result = models.FileField(_("Result"), null=True, blank=True,                                upload_to="exports/%Y/%m/") -    result_info = models.TextField(_("Result information"), null=True, -                                   blank=True) +    result_info = models.TextField(_("Result information"), blank=True, +                                   default="")      class Meta:          verbose_name = _("Archive - Export") | 
