smoke test the rest of the apps
This commit is contained in:
+9
-5
@@ -107,6 +107,8 @@ def normaliseScore(score):
|
||||
class AuthorOrCheckerRequiredMixin(object):
|
||||
def get_object(self, *args, **kwargs):
|
||||
obj = super().get_object(*args, **kwargs)
|
||||
if self.request.user.is_superuser:
|
||||
return obj
|
||||
if self.request.user.groups.filter(name="shorts_checker").exists():
|
||||
return obj
|
||||
if self.request.user not in obj.author.all():
|
||||
@@ -351,8 +353,8 @@ def mark_all(request, exam_pk, sk):
|
||||
def mark_review(request, exam_pk, sk):
|
||||
return mark(request, exam_pk, sk, unmarked_exam_answers_only=False, review=True)
|
||||
|
||||
def mark_answer_override(request, exam_id, question_number, cid):
|
||||
return mark_answer(request, exam_id, question_number, cid, override=True)
|
||||
def mark_answer_override(request, exam_id, question_number, answer_id):
|
||||
return mark_answer(request, exam_id, question_number, answer_id, override=True)
|
||||
|
||||
|
||||
def mark_answer(request, exam_id, question_number, answer_id, override=False):
|
||||
@@ -548,9 +550,8 @@ def mark_answer(request, exam_id, question_number, answer_id, override=False):
|
||||
},
|
||||
)
|
||||
|
||||
# @user_passes_test(user_is_admin, login_url="/accounts/login")
|
||||
@login_required
|
||||
def mark(request, exam_pk, sk, unmarked_exam_answers_only=True):
|
||||
def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
|
||||
exam = get_object_or_404(Exam, pk=exam_pk)
|
||||
|
||||
if not GenericExamViews.check_user_marker_access(request.user, exam_pk):
|
||||
@@ -591,6 +592,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True):
|
||||
"user_answers": user_answers,
|
||||
"unmarked_count": unmarked_count,
|
||||
"marker_unmarked_count": marker_unmarked_count,
|
||||
"review": review,
|
||||
},
|
||||
)
|
||||
else:
|
||||
@@ -603,6 +605,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True):
|
||||
"question_details": question_details,
|
||||
"user_answers": user_answers,
|
||||
"unmarked_count": unmarked_count,
|
||||
"review": review,
|
||||
},
|
||||
)
|
||||
|
||||
@@ -756,7 +759,8 @@ def question_json(request, pk):
|
||||
def question_viewer(request):
|
||||
# question = get_object_or_404(Question, pk=pk)
|
||||
|
||||
ids = request.GET.get("ids").split(",")
|
||||
ids_param = request.GET.get("ids")
|
||||
ids = ids_param.split(",") if ids_param else []
|
||||
|
||||
return render(
|
||||
request,
|
||||
|
||||
Reference in New Issue
Block a user