diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-03-24 18:04:01 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2025-07-21 15:07:41 +0200 |
commit | 4f8fe31ad39bf0b82842690aeedf20a50d8812df (patch) | |
tree | 750a9c700bf58b358e600c430f23934a1bbf6332 /ishtar_common/models.py | |
parent | 7aa1ab1b09bcafb2f806e389f4b7090332004e55 (diff) | |
download | Ishtar-4f8fe31ad39bf0b82842690aeedf20a50d8812df.tar.bz2 Ishtar-4f8fe31ad39bf0b82842690aeedf20a50d8812df.zip |
♻️ django 3.2 - new version of libraries: fix errors and deprecation warnings
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r-- | ishtar_common/models.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index b7d6004c3..5ae5b276e 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -60,7 +60,7 @@ from django.contrib.gis.db import models from django.contrib.gis.db.models.aggregates import Union from django.contrib.gis.geos.polygon import Polygon from django.contrib.gis.geos.collections import MultiPolygon -from django.contrib.postgres.fields import JSONField, ArrayField +from django.contrib.postgres.fields import ArrayField from django.contrib.postgres.indexes import GinIndex from django.contrib.sites.models import Site from django.core.cache import cache @@ -72,7 +72,7 @@ from django.core.exceptions import ( from django.core.files.base import ContentFile from django.core.files.uploadedfile import SimpleUploadedFile from django.db import connection, transaction -from django.db.models import Q, Max, Count +from django.db.models import JSONField, Q, Max, Count from django.db.models.signals import post_save, post_delete, pre_delete, m2m_changed from django.db.utils import DatabaseError from django.template import Context, Template @@ -2993,7 +2993,7 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem): "ishtaruser__isnull": "ishtaruser__isnull", "attached_to": "attached_to", } - COL_LABELS = {"attached_to": _("Organization")} + COL_LABELS = {"attached_to": _("Organization"), "person_types_list": _("Types")} # alternative names of fields for searches ALT_NAMES = { @@ -5252,7 +5252,7 @@ class Document( additional_information = models.TextField( _("Additional information"), blank=True, default="" ) - duplicate = models.NullBooleanField(_("Has a duplicate"), blank=True, null=True) + duplicate = models.BooleanField(_("Has a duplicate"), blank=True, null=True) associated_links = models.TextField(_("Symbolic links"), blank=True, default="") cache_related_label = models.TextField( _("Related"), |