diff --git a/Pipfile b/Pipfile index 6e856c1c..5bf03426 100644 --- a/Pipfile +++ b/Pipfile @@ -4,14 +4,14 @@ verify_ssl = true name = "pypi" [packages] -django = "==3.2.*" +django = "==4.0.*" # Templatetags for bootstrap3 django-braces = "*" # Extra mixinclasses for models and views django-contrib-comments = "*" django-filebrowser-no-grappelli = "*" # Filebrowser for mediafiles. -django-haystack = "==3.0b1" # Search functionality for django models. See whoosh as well +django-haystack = "==3.2" # Search functionality for django models. See whoosh as well django-hitcount = "*" -django-image-cropping = "==1.5" +django-image-cropping = "==1.7" django-markdown-deux = "*" django-sekizai = "*" # Templatetag library for extra block functionality easy-thumbnails = "*" # Thumbnail creator @@ -27,6 +27,7 @@ django-multi-email-field = "*" django-bootstrap4 = "*" django-ckeditor = "*" djangorestframework = "*" +tzdata = "*" # django-4.* uses zoneinfo, which in turn relies on tzdata. On windows tzdata is as of now ()13.10.2023) not installed by default [dev-packages] pre-commit = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 052c4afe..5188827b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "8147de27d3873fb743bf69d7875ad388e4dafc5975be218792dc26e530b24109" + "sha256": "fe7bc0895f042b22ef96489b12f17b225d0f76f06d477f85a61d7c666f46452b" }, "pipfile-spec": 6, "requires": { @@ -50,11 +50,11 @@ }, "django": { "hashes": [ - "sha256:83b6d66b06e484807d778263fdc7f9186d4dc1862fcfa6507830446ac6b060ba", - "sha256:c5e7b668025a6e06cad9ba6d4de1fd1a21212acebb51ea34abb400c6e4d33430" + "sha256:2c2f73c16b11cb272c6d5e3b063f0d1be06f378d8dc6005fbe8542565db659cc", + "sha256:4496eb4f65071578b703fdc6e6f29302553c7440e3f77baf4cefa4a4e091fc3d" ], "index": "pypi", - "version": "==3.2.22" + "version": "==4.0.10" }, "django-appconf": { "hashes": [ @@ -121,11 +121,10 @@ }, "django-haystack": { "hashes": [ - "sha256:9dba64f5c76cf147ac382d4a4a270f30d30a45a3a7a1738a9d05c96d18777c07", - "sha256:b83705e1cf8141cd1755fc6683ac65fea4e1281f4b4306bc9224af96495b0df3" + "sha256:f0284b822f866945f8041f091f5e384ae1ccd1152c7ea5a5b09a0b198cc6d4e4" ], "index": "pypi", - "version": "==3.0b1" + "version": "==3.2" }, "django-hitcount": { "hashes": [ @@ -137,11 +136,11 @@ }, "django-image-cropping": { "hashes": [ - "sha256:59744e8df88db7e46e37b526fc715fdde665d9efa345922745f50411a6dadb3f", - "sha256:81dbcabb6421c5a1e88fac9d96f336d6109a23dcb8fa6c678329d3688c9973c4" + "sha256:429ad2c3ccad5ddeb079fbee24dc1536105b3e9d30beb53d1446fd560da04d5b", + "sha256:971d1a92c9ef14f1bf95996dd4eeed0a00dbb2221bfa762290d9525696243232" ], "index": "pypi", - "version": "==1.5" + "version": "==1.7" }, "django-js-asset": { "hashes": [ @@ -497,6 +496,14 @@ "markers": "python_version < '3.11'", "version": "==4.8.0" }, + "tzdata": { + "hashes": [ + "sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a", + "sha256:7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda" + ], + "index": "pypi", + "version": "==2023.3" + }, "wand": { "hashes": [ "sha256:1b77e25439ace57f665d1ccc6cff2766fad0834005b89ae3e7aaf3ba12b124b0", @@ -591,6 +598,14 @@ "markers": "python_version >= '3.7'", "version": "==8.1.7" }, + "colorama": { + "hashes": [ + "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", + "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6" + ], + "markers": "platform_system == 'Windows'", + "version": "==0.4.6" + }, "dill": { "hashes": [ "sha256:76b122c08ef4ce2eedcd4d1abd8e641114bfc6c2867f49f3c41facf65bf19f5e", @@ -616,11 +631,11 @@ }, "faker": { "hashes": [ - "sha256:5b234b89a9c536a37420f612169b6e58627b823ba1bba2504c0450db3b136620", - "sha256:d86cb3150626bd642c6abd8a64107ddb0b154500252f46a56efe527a50594866" + "sha256:63da90512d0cb3acdb71bd833bb3071cb8a196020d08b8567a01d232954f1820", + "sha256:f321e657ed61616fbfe14dbb9ccc6b2e8282652bbcfcb503c1bd0231ff834df6" ], "index": "pypi", - "version": "==19.8.0" + "version": "==19.10.0" }, "filelock": { "hashes": [ @@ -846,11 +861,11 @@ }, "pre-commit": { "hashes": [ - "sha256:6bbd5129a64cad4c0dfaeeb12cd8f7ea7e15b77028d985341478c8af3c759522", - "sha256:96d529a951f8b677f730a7212442027e8ba53f9b04d217c4c67dc56c393ad945" + "sha256:5804465c675b659b0862f07907f96295d490822a450c4c40e747d0b1c6ebcb32", + "sha256:841dc9aef25daba9a0238cd27984041fa0467b4199fc4852e27950664919f660" ], "index": "pypi", - "version": "==3.4.0" + "version": "==3.5.0" }, "pycodestyle": { "hashes": [ diff --git a/nablapps/accounts/admin.py b/nablapps/accounts/admin.py index 6c30acfc..97caf855 100644 --- a/nablapps/accounts/admin.py +++ b/nablapps/accounts/admin.py @@ -11,7 +11,7 @@ from django.contrib.flatpages.models import FlatPage from django.http import HttpResponseRedirect from django.urls import reverse -from django.utils.encoding import smart_text +from django.utils.encoding import smart_str from .forms import NablaUserChangeForm, NablaUserCreationForm from .models import FysmatClass, NablaGroup, NablaUser, RegistrationRequest @@ -30,7 +30,7 @@ class UserFullnameMultipleChoiceField(forms.ModelMultipleChoiceField): """ def label_from_instance(self, obj): - return smart_text(f"{obj.get_full_name()} - {obj.username}") + return smart_str(f"{obj.get_full_name()} - {obj.username}") class GroupAdminForm(forms.ModelForm): diff --git a/nablapps/events/templates/events/administer_penalties.html b/nablapps/events/templates/events/administer_penalties.html index c976d756..fa7dcb79 100644 --- a/nablapps/events/templates/events/administer_penalties.html +++ b/nablapps/events/templates/events/administer_penalties.html @@ -44,9 +44,9 @@

Prikkadministrering for {{ event.headli {% for penalty in event.get_penalty_rule_dict.values %} - + {% endfor %} - + {% if registration.attendance_registration %} Ja diff --git a/nablapps/events/templates/events/event_detail.html b/nablapps/events/templates/events/event_detail.html index a01d53ab..ea3f559c 100644 --- a/nablapps/events/templates/events/event_detail.html +++ b/nablapps/events/templates/events/event_detail.html @@ -23,7 +23,7 @@

PĆ„meldte

{% for registration in event.eventregistration_set.all %} {% with user=registration.user %} - diff --git a/templates/comments/preview.html b/templates/comments/preview.html index d9fa4e84..4e9cd8a5 100644 --- a/templates/comments/preview.html +++ b/templates/comments/preview.html @@ -16,7 +16,7 @@

{% blocktrans count form.errors|length as counter %}Please correct the error {% else %} {% if field.errors %}