summaryrefslogtreecommitdiff
path: root/ishtar_common/models_common.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2022-05-18 16:23:02 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-12-12 12:20:58 +0100
commit07e3e2e9c3da9f05634a45f65723504c229f2baa (patch)
tree7e3ea0f3306eea50e9f95a7c90b397c5515e97fb /ishtar_common/models_common.py
parent3b671732319aa14f194821a8f547ae280e1e0648 (diff)
downloadIshtar-07e3e2e9c3da9f05634a45f65723504c229f2baa.tar.bz2
Ishtar-07e3e2e9c3da9f05634a45f65723504c229f2baa.zip
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)
Diffstat (limited to 'ishtar_common/models_common.py')
-rw-r--r--ishtar_common/models_common.py8
1 files changed, 4 insertions, 4 deletions
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 = []