tidy up the marker changes

longs/views.py

@@ -641,17 +641,19 @@ class LongSeriesView(LoginRequiredMixin, SingleTableMixin, FilterView):
     filterset_class = LongSeriesFilter
 
 
-@user_is_long_marker
-@reversion.create_revision()
+#@user_is_long_marker
 def mark_answer_override(request, exam_id, question_number, cid):
     return mark_answer(request, exam_id, question_number, cid, override=True)
 
 
-@user_is_long_marker
+#@user_is_long_marker
 @reversion.create_revision()
 def mark_answer(request, exam_id, question_number, answer_id, override=False):
     exam = get_object_or_404(Exam, pk=exam_id)
 
+    if not GenericExamViews.check_user_marker_access(request.user, exam_id):
+        raise PermissionDenied
+
     questions = exam.get_questions()
 
     n = question_number
@@ -843,10 +845,13 @@ def mark_answer(request, exam_id, question_number, answer_id, override=False):
 
 # @user_passes_test(user_is_admin, login_url="/accounts/login")
 @login_required
-@user_is_long_marker
+#@user_is_long_marker
 def mark(request, exam_id, sk):
     exam = get_object_or_404(Exam, pk=exam_id)
 
+    if not GenericExamViews.check_user_marker_access(request.user, exam_id):
+        raise PermissionDenied
+
     questions = exam.get_questions()
 
     n = sk