Merge branch 'meta-upgrades' into 'main'

Upgrade Django to 3.2

Closes #114

See merge request !134

AKModel/forms.py

 from bootstrap_datepicker_plus import DateTimePickerInput
 from django import forms
 from django.forms.utils import ErrorList
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from AKModel.models import Event, AKCategory, AKRequirement
 

AKModel/templates/admin/login.html

-{% extends "admin/base_site.html" %}
+{% extends "admin/login.html" %}
 {% load i18n static %}
 
-{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}">
-{{ form.media }}
-{% endblock %}
-
-{% block bodyclass %}{{ block.super }} login{% endblock %}
-
-{% block usertools %}{% endblock %}
-
-{% block nav-global %}{% endblock %}
-
-{% block nav-sidebar %}{% endblock %}
-
-{% block content_title %}{% endblock %}
-
-{% block breadcrumbs %}{% endblock %}
 
 {% block content %}
 {% if form.errors and not form.non_field_errors %}

AKPlanning/settings.py

@@ -99,6 +99,8 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'AKPlanning.wsgi.application'
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # Database
 # https://docs.djangoproject.com/en/2.2/ref/settings/#databases
 

requirements.txt

-Django==3.1.8
+Django==3.2.16
 django-bootstrap4==2.3.1
 django-fontawesome-5==1.0.18
-django-split-settings==1.0.1
+django-split-settings==1.2.0
 django-timezone-field==4.1.2
-djangorestframework==3.12.4
-django-simple-history==3.0.0
-django-registration-redux==2.9
-django-debug-toolbar==3.2.1
+djangorestframework==3.14.0
+django-simple-history==3.1.1
+django-registration-redux==2.11
+django-debug-toolbar==3.7.0
 django-bootstrap-datepicker-plus==3.0.5
 django-tex @ git+https://github.com/bhaettasch/django-tex.git@66cc6567acde4db2ac971b7707652067e664392c
 django-csp==3.7
 mysqlclient==2.0.3  # for production deployment
-pytz==2021.1
+pytz==2022.4

static_common/common/css/admin-bootstrap.css

+/*
+    Load both the django admin base style and bootstrap -- but make sure bootstrap is loaded first to override all critical theme settings from bootstrap with the default admin style.
+    This especially fixes the dark theme.
+*/
+@import "/static/common/css/bootstrap.css";
+@import "../../admin/css/base.css";

templates/admin/base_site.html

@@ -4,6 +4,8 @@
 {% load fontawesome_5 %}
 {% load static %}
 
+{% block stylesheet %}{% static "common/css/admin-bootstrap.css" %}{% endblock %}
+
 {% block extrastyle %}
     {% if not debug %}
         <link rel="stylesheet" type="text/css" href="{% static "common/css/admin-color.css" %}"/>
@@ -12,7 +14,6 @@
 
 {% block extrahead %}
     <!-- Load bootstrap, jquery and fontawesome-->
-    {% bootstrap_css %}
     {% bootstrap_javascript jquery=True %}
     {% fontawesome_5_static %}