From 8a8fd5f80882398241c175b7a45efb97684fd5cf Mon Sep 17 00:00:00 2001 From: Ross Date: Sun, 12 Dec 2021 13:36:20 +0000 Subject: [PATCH] . --- generic/views.py | 5 ++++- rad/views.py | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/generic/views.py b/generic/views.py index ead4b102..b8a1edfa 100644 --- a/generic/views.py +++ b/generic/views.py @@ -608,13 +608,16 @@ class ExamViews(View, LoginRequiredMixin): }, ) - def active_exams(self, request, json=True, based=True): + def active_exams(self, request, json=True, based=True, cid=None, passcode=None): exams = self.Exam.objects.filter(archive=False) active_exams = {"exams": []} for exam in exams: if exam.active or self.check_user_access(request.user, exam.pk): + if not exam.check_cid_user(cid, passcode): + continue + if exam.json_creation_time: creation_time = exam.json_creation_time.isoformat() else: diff --git a/rad/views.py b/rad/views.py index 1e795f83..bb085191 100644 --- a/rad/views.py +++ b/rad/views.py @@ -171,6 +171,11 @@ def active_exams_unbased(request): active_exams = {"exams": exams} + if request.user: + active_exams["user"] = request.user.username + else: + active_exams["user"] = False + return JsonResponse(active_exams)