From a43e89d4317660f10aeed5873f71136408d22969 Mon Sep 17 00:00:00 2001 From: Nikolas Nyby Date: Fri, 5 Dec 2025 16:59:38 -0500 Subject: [PATCH] :arrow_up: Django 5.2 --- .github/workflows/build-and-test.yml | 2 +- CHANGES.txt | 4 ++++ Makefile | 2 +- courseaffils/middleware.py | 5 +++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0364cd8..5ab13aa 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -6,7 +6,7 @@ jobs: strategy: matrix: python-version: ["3.12"] - django-version: [4.2] + django-version: [5.2] steps: - uses: actions/checkout@v6 diff --git a/CHANGES.txt b/CHANGES.txt index da99777..497563d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +2.5.0 +==================== +* Adds compatibility with Django 5.2 + 2.4.0 (2023-08-01) ==================== * Removed django-jenkins diff --git a/Makefile b/Makefile index 8aa69de..1452fde 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ WHEEL_VERSION ?= 0.45.1 PIP_VERSION ?= 25.3 MAX_COMPLEXITY ?= 12 PY_DIRS ?= $(APP) -DJANGO ?= "Django==4.2.13" +DJANGO ?= "Django==5.2.9" FLAKE8 ?= $(VE)/bin/flake8 PIP ?= $(VE)/bin/pip diff --git a/courseaffils/middleware.py b/courseaffils/middleware.py index 1043688..b349970 100644 --- a/courseaffils/middleware.py +++ b/courseaffils/middleware.py @@ -144,7 +144,7 @@ def process_request(self, request, override_view=None): if request.user.is_staff or \ CourseAccess.allowed(request) or \ (request.user in course.members): - request.session[SESSION_KEY] = course + request.session[SESSION_KEY] = course.pk self.decorate_request(request, course) if 'next' in request.GET: @@ -153,7 +153,8 @@ def process_request(self, request, override_view=None): return None if SESSION_KEY in request.session: - course = request.session[SESSION_KEY] + course_pk = request.session[SESSION_KEY] + course = get_object_or_404(Course, pk=course_pk) self.decorate_request(request, course) return None