From 07e3e2e9c3da9f05634a45f65723504c229f2baa Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 18 May 2022 16:23:02 +0200 Subject: Migration to Django 2.2 - many fixes - remove redondant permissions - fix missing kwargs for widget and form fields - fix default to callable for model field - quick and dirty fix for datepicker - is_authenticated() -> is_authenticated - fix registration urls - remove six usage (no more python2) --- ishtar_common/models_common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ishtar_common/models_common.py') diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 6b137f2fd..66cf0c5e5 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -31,7 +31,7 @@ from django.core.cache import cache from django.core.exceptions import ObjectDoesNotExist from django.core.files import File from django.core.serializers import serialize -from django.urls import reverse +from django.urls import reverse, NoReverseMatch from django.core.validators import validate_slug from django.db import connection from django.db.models import Q, Count, Max @@ -1002,7 +1002,7 @@ class Imported(models.Model): class JsonData(models.Model, CachedGen): - data = JSONField(default={}, blank=True) + data = JSONField(default=dict, blank=True) class Meta: abstract = True @@ -1320,7 +1320,7 @@ class BaseHistorizedItem( null=True, ) last_modified = models.DateTimeField(blank=True, default=datetime.datetime.now) - history_m2m = JSONField(default={}, blank=True) + history_m2m = JSONField(default=dict, blank=True) need_update = models.BooleanField(verbose_name=_("Need update"), default=False) locked = models.BooleanField( verbose_name=_("Item locked for edition"), default=False @@ -1727,7 +1727,7 @@ class OwnPerms(object): """ if not replace_query: replace_query = {} - if hasattr(user, "is_authenticated") and not user.is_authenticated(): + if hasattr(user, "is_authenticated") and not user.is_authenticated: returned = cls.objects.filter(pk__isnull=True) if values: returned = [] -- cgit v1.2.3