.

physics/views.py

@@ -50,6 +50,7 @@ from generic.views import (
     ExamUpdateBase,
     ExamViews,
     GenericViewBase,
+    exam_inactive,
 )
 
 from rest_framework import viewsets, permissions
@@ -168,7 +169,7 @@ def exam_take_old(request, pk):
     exam = get_object_or_404(Exam, pk=pk)
 
     if not exam.active:
-        raise Http404("Exam not found")
+        raise exam_inactive(request)
 
     questions = exam.exam_questions.all()
 
@@ -186,7 +187,7 @@ def exam_start(request, pk):
     exam = get_object_or_404(Exam, pk=pk)
 
     if not exam.active:
-        raise Http404("Exam not found")
+        return exam_inactive(request, context={"exam": exam})
 
     return render(
         request,
@@ -200,12 +201,13 @@ def exam_start(request, pk):
 def exam_take_overview(request, pk, cid=None, passcode=None):
     exam = get_object_or_404(Exam, pk=pk)
 
-    if not exam.active:
-        raise Http404("Exam not found")
-
     if cid is not None and not exam.check_cid_user(cid, passcode):
         raise Http404("Error accessing exam")
 
+    if not exam.active:
+        return exam_inactive(request, context={"exam": exam})
+
+
     questions = exam.exam_questions.all()
 
     if cid is not None:
@@ -253,7 +255,7 @@ def exam_take(request, pk, sk, cid=None, passcode=None):
     exam = get_object_or_404(Exam, pk=pk)
 
     if not exam.active:
-        raise Http404("Exam not found")
+        return exam_inactive(request, context={"exam": exam})
 
     if cid is not None and not exam.check_cid_user(cid, passcode):
         raise Http404("Error accessing exam")