Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
strategy:
matrix:
python-version: ["3.12"]
django-version: [4.2]
django-version: [5.2]
steps:
- uses: actions/checkout@v6

Expand Down
4 changes: 4 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2.5.0
====================
* Adds compatibility with Django 5.2

2.4.0 (2023-08-01)
====================
* Removed django-jenkins
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions courseaffils/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down