From 18b0be55cdbb4e25677e517826360c811dc6cc73 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Tue, 31 Aug 2021 22:09:24 +0100
Subject: [PATCH] .

---
 anatomy/templates/anatomy/exam_scores.html |  2 +-
 longs/decorators.py                        | 32 ++++++++++++++++++++++
 longs/templates/longs/exam_scores.html     |  2 +-
 longs/views.py                             | 12 ++++----
 rapids/templates/rapids/exam_scores.html   |  2 +-
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/anatomy/templates/anatomy/exam_scores.html b/anatomy/templates/anatomy/exam_scores.html
index 4db7dc0f..5e1ff906 100644
--- a/anatomy/templates/anatomy/exam_scores.html
+++ b/anatomy/templates/anatomy/exam_scores.html
@@ -5,7 +5,7 @@
     <h2>{{ exam.name }}</h2>
 
     {% if unmarked %}
-    <div class="alert alert-info" role="alert">
+    <div class="alert alert-warning" role="alert">
         The following questions need marking
         {% for exam_index in unmarked %}
         <a href="{% url 'anatomy:mark' exam.pk exam_index %}">{{ exam_index|add:1 }}</a>
diff --git a/longs/decorators.py b/longs/decorators.py
index ca5fa30e..c0359c09 100755
--- a/longs/decorators.py
+++ b/longs/decorators.py
@@ -1,6 +1,17 @@
 from django.core.exceptions import PermissionDenied
 from .models import Long, LongSeries
 
+def user_is_author_or_long_series_checker_or_long_marker(function):
+    def wrap(request, *args, **kwargs):
+        series = LongSeries.objects.get(pk=kwargs['pk'])
+        if request.user in series.get_author_objects() or request.user.groups.filter(name='long_checker').exists() or request.user.groups.filter(name='long_marker').exists() or request.user.is_superuser:
+            return function(request, *args, **kwargs)
+        else:
+            raise PermissionDenied
+    wrap.__doc__ = function.__doc__
+    wrap.__name__ = function.__name__
+    return wrap
+
 def user_is_author_or_long_series_checker(function):
     def wrap(request, *args, **kwargs):
         series = LongSeries.objects.get(pk=kwargs['pk'])
@@ -12,6 +23,17 @@ def user_is_author_or_long_series_checker(function):
     wrap.__name__ = function.__name__
     return wrap
 
+def user_is_author_or_long_checker_or_long_marker(function):
+    def wrap(request, *args, **kwargs):
+        long = Long.objects.get(pk=kwargs['pk'])
+        if request.user in long.author.all() or request.user.groups.filter(name='long_checker').exists()  or request.user.groups.filter(name='long_marker').exists() or request.user.is_superuser:
+            return function(request, *args, **kwargs)
+        else:
+            raise PermissionDenied
+    wrap.__doc__ = function.__doc__
+    wrap.__name__ = function.__name__
+    return wrap
+
 def user_is_author_or_long_checker(function):
     def wrap(request, *args, **kwargs):
         long = Long.objects.get(pk=kwargs['pk'])
@@ -31,4 +53,14 @@ def user_is_long_checker(function):
             raise PermissionDenied
     wrap.__doc__ = function.__doc__
     wrap.__name__ = function.__name__
+    return wrap
+
+def user_is_long_marker(function):
+    def wrap(request, *args, **kwargs):
+        if request.user.groups.filter(name='long_marker').exists() or request.user.is_superuser:
+            return function(request, *args, **kwargs)
+        else:
+            raise PermissionDenied
+    wrap.__doc__ = function.__doc__
+    wrap.__name__ = function.__name__
     return wrap
\ No newline at end of file
diff --git a/longs/templates/longs/exam_scores.html b/longs/templates/longs/exam_scores.html
index 366af943..56b275a1 100644
--- a/longs/templates/longs/exam_scores.html
+++ b/longs/templates/longs/exam_scores.html
@@ -5,7 +5,7 @@
     <h2>{{ exam.name }}</h2>
 
     {% if unmarked %}
-    <div class="alert alert-info" role="alert">
+    <div class="alert alert-warning" role="alert">
         The following questions need marking
         {% for exam_index in unmarked %}
         <a href="{% url 'longs:mark' exam.pk exam_index %}">{{ exam_index|add:1 }}</a>
diff --git a/longs/views.py b/longs/views.py
index 3291aa15..f9af2591 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -42,7 +42,7 @@ from .filters import LongFilter, LongSeriesFilter, UserAnswerFilter
 from django_tables2 import SingleTableView, SingleTableMixin
 from django_filters.views import FilterView
 
-from .decorators import user_is_author_or_long_checker, user_is_long_checker, user_is_author_or_long_series_checker
+from .decorators import user_is_author_or_long_checker, user_is_author_or_long_checker_or_long_marker, user_is_author_or_long_series_checker_or_long_marker, user_is_long_checker, user_is_author_or_long_series_checker, user_is_long_marker, user_is_author_or_long_checker_or_long_marker
 
 from collections import defaultdict
 import json
@@ -97,7 +97,7 @@ class AuthorOrCheckerRequiredMixin(object):
 
 
 @login_required
-@user_is_author_or_long_checker
+@user_is_author_or_long_checker_or_long_marker
 def question_detail(request, pk):
     long = get_object_or_404(Long, pk=pk)
 
@@ -109,7 +109,7 @@ def question_detail(request, pk):
     return render(request, "longs/question_detail.html", {"question": long})
 
 @login_required
-@user_is_author_or_long_series_checker
+@user_is_author_or_long_series_checker_or_long_marker
 def long_series_detail(request, pk):
     series = get_object_or_404(LongSeries, pk=pk)
 
@@ -637,7 +637,7 @@ def loadJsonAnswer(answer):
 
 
 @login_required
-@user_is_long_checker
+@user_is_long_marker
 @reversion.create_revision()
 def mark_answer(request, pk, sk, tk):
     exam = get_object_or_404(Exam, pk=pk)
@@ -710,7 +710,7 @@ def mark_answer(request, pk, sk, tk):
 
 # @user_passes_test(user_is_admin, login_url="/accounts/login")
 @login_required
-@user_is_long_checker
+@user_is_long_marker
 def mark(request, pk, sk):
     exam = get_object_or_404(Exam, pk=pk)
 
@@ -747,7 +747,7 @@ def mark(request, pk, sk):
 
 
 @login_required
-@user_is_long_checker
+@user_is_long_marker
 def exam_scores_cid(request, pk):
     exam = get_object_or_404(Exam, pk=pk)
 
diff --git a/rapids/templates/rapids/exam_scores.html b/rapids/templates/rapids/exam_scores.html
index 2fbca25a..53d9df39 100644
--- a/rapids/templates/rapids/exam_scores.html
+++ b/rapids/templates/rapids/exam_scores.html
@@ -6,7 +6,7 @@
     <h2>{{ exam.name }}</h2>
 
     {% if unmarked %}
-    <div class="alert alert-info" role="alert">
+    <div class="alert alert-warning" role="alert">
         The following questions need marking
         {% for exam_index in unmarked %}
         <a href="{% url 'rapids:mark' exam.pk exam_index %}">{{ exam_index|add:1 }}</a>