.

rapids/views.py

@@ -46,6 +46,7 @@ from generic.views import (
     AuthorRequiredMixin,
     ExamCloneMixin,
     ExamCreateBase,
+    ExamDeleteBase,
     ExamUpdateBase,
     ExamViews,
     GenericViewBase,
@@ -787,6 +788,9 @@ class ExamUpdate(ExamUpdateBase, AuthorOrCheckerRequiredMixin):
     form_class = ExamForm
 
 
+class ExamDelete(AuthorOrCheckerRequiredMixin, ExamDeleteBase):
+    model = Exam
+
 class ExamAuthorUpdate(
     RevisionMixin, LoginRequiredMixin, AuthorRequiredMixin, UpdateView
 ):
@@ -794,11 +798,6 @@ class ExamAuthorUpdate(
     form_class = ExamAuthorForm
 
 
-class ExamDelete(RevisionMixin, AuthorOrCheckerRequiredMixin, DeleteView):
-    model = Exam
-    template_name = "exam_confirm_delete.html"
-    success_url = reverse_lazy("rapids:index")
-
 
 class UserAnswerView(LoginRequiredMixin, DetailView):
     model = CidUserAnswer
@@ -840,9 +839,9 @@ class ExamViewSet(RevisionMixin, viewsets.ModelViewSet):
         """
         user = self.request.user
         if user.groups.filter(name="rapid_checker").exists():
-            return Exam.objects.all()
+            return Exam.objects.filter(archive=False).order_by('name')
 
-        return Exam.objects.filter(author__id=user.id)
+        return Exam.objects.filter(author__id=user.id, archive=False).order_by('name')
 
 
 class QuestionAnswerViewSet(viewsets.ModelViewSet):