From 92404b791b6629d0d9ab2b662b4ba032795d5933 Mon Sep 17 00:00:00 2001 From: Ross Date: Sat, 1 May 2021 12:50:46 +0100 Subject: [PATCH] . --- anatomy/templates/anatomy/exam_overview.html | 1 + anatomy/urls.py | 1 + anatomy/views.py | 6 +++++- rapids/templates/rapids/exam_overview.html | 1 + rapids/urls.py | 1 + rapids/views.py | 3 +++ 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/anatomy/templates/anatomy/exam_overview.html b/anatomy/templates/anatomy/exam_overview.html index a8126304..b7109588 100644 --- a/anatomy/templates/anatomy/exam_overview.html +++ b/anatomy/templates/anatomy/exam_overview.html @@ -5,6 +5,7 @@ {% load thumbnail %}
Edit + Delete Admin Edit

Exam: {{ exam.name }}

This exam has {{question_number}} questions. Time limit: {{exam.time_limit}} seconds. diff --git a/anatomy/urls.py b/anatomy/urls.py index 7626a965..a9c2c55e 100644 --- a/anatomy/urls.py +++ b/anatomy/urls.py @@ -32,6 +32,7 @@ urlpatterns = [ path("exam/", views.AnatomyExamViews.exam_list, name="exam_list"), path("exam/create", views.ExamCreate.as_view(), name="exam_create"), path("exam//update", views.ExamUpdate.as_view(), name="exam_update"), + path("exam//delete", views.ExamDelete.as_view(), name="exam_delete"), path("exam/json/", views.AnatomyExamViews.active_exams, name="active_exams"), path("exam/json/", views.AnatomyExamViews.exam_json, name="exam_json"), path("exam/json//recreate", views.AnatomyExamViews.exam_json_recreate, name="exam_json_recreate"), diff --git a/anatomy/views.py b/anatomy/views.py index 574c511c..9806bff4 100644 --- a/anatomy/views.py +++ b/anatomy/views.py @@ -1024,4 +1024,8 @@ class ExamViewSet(viewsets.ModelViewSet): if user.groups.filter(name="rapid_checker").exists(): return Exam.objects.all() - return Exam.objects.filter(author__id=user.id) \ No newline at end of file + return Exam.objects.filter(author__id=user.id) + +class ExamDelete(AuthorOrCheckerRequiredMixin, DeleteView): + model = Exam + success_url = reverse_lazy("anatomy:index") \ No newline at end of file diff --git a/rapids/templates/rapids/exam_overview.html b/rapids/templates/rapids/exam_overview.html index 27df8500..cec014f0 100644 --- a/rapids/templates/rapids/exam_overview.html +++ b/rapids/templates/rapids/exam_overview.html @@ -5,6 +5,7 @@ {% load thumbnail %}
Edit + Delete Admin Edit

Exam: {{ exam.name }}

This exam has {{question_number}} questions. Time limit: {{exam.time_limit}} seconds.
diff --git a/rapids/urls.py b/rapids/urls.py index 04d6bb22..3f123476 100755 --- a/rapids/urls.py +++ b/rapids/urls.py @@ -34,6 +34,7 @@ urlpatterns = [ path("exam/", views.RapidExamViews.exam_list, name="exam_list"), path("exam/create", views.ExamCreate.as_view(), name="exam_create"), path("exam//update", views.ExamUpdate.as_view(), name="exam_update"), + path("exam//delete", views.ExamDelete.as_view(), name="exam_delete"), path("exam/json/", views.RapidExamViews.active_exams, name="active_exams"), path("exam/json/", views.RapidExamViews.exam_json, name="exam_json"), path("exam/json//unbased", views.RapidExamViews.exam_json_unbased, name="exam_json_unbased"), diff --git a/rapids/views.py b/rapids/views.py index a40905b0..7165a969 100755 --- a/rapids/views.py +++ b/rapids/views.py @@ -1001,3 +1001,6 @@ class RapidViewSet(viewsets.ModelViewSet): permission_classes = [permissions.IsAuthenticated] pagination_class = StandardResultsSetPagination +class ExamDelete(AuthorOrCheckerRequiredMixin, DeleteView): + model = Exam + success_url = reverse_lazy("rapids:index") \ No newline at end of file