.
This commit is contained in:
+4
-1
@@ -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)
|
exams = self.Exam.objects.filter(archive=False)
|
||||||
|
|
||||||
active_exams = {"exams": []}
|
active_exams = {"exams": []}
|
||||||
|
|
||||||
for exam in exams:
|
for exam in exams:
|
||||||
if exam.active or self.check_user_access(request.user, exam.pk):
|
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:
|
if exam.json_creation_time:
|
||||||
creation_time = exam.json_creation_time.isoformat()
|
creation_time = exam.json_creation_time.isoformat()
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -171,6 +171,11 @@ def active_exams_unbased(request):
|
|||||||
|
|
||||||
active_exams = {"exams": exams}
|
active_exams = {"exams": exams}
|
||||||
|
|
||||||
|
if request.user:
|
||||||
|
active_exams["user"] = request.user.username
|
||||||
|
else:
|
||||||
|
active_exams["user"] = False
|
||||||
|
|
||||||
return JsonResponse(active_exams)
|
return JsonResponse(active_exams)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user