fnp
/
edumed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e75480
)
403 message
author
Jan Szejko
<janek37@gmail.com>
Wed, 11 Jan 2017 13:07:49 +0000
(14:07 +0100)
committer
Jan Szejko
<janek37@gmail.com>
Wed, 11 Jan 2017 13:07:49 +0000
(14:07 +0100)
stage2/views.py
patch
|
blob
|
history
diff --git
a/stage2/views.py
b/stage2/views.py
index
974e375
..
7f3422e
100644
(file)
--- a/
stage2/views.py
+++ b/
stage2/views.py
@@
-75,7
+75,7
@@
def get_file(request, assignment_id, file_no, participant_id, key):
def assignment_list(request):
assignments = request.user.stage2_assignments.all()
if not assignments:
def assignment_list(request):
assignments = request.user.stage2_assignments.all()
if not assignments:
- return HttpResponseForbidden()
+ return HttpResponseForbidden(
'Not allowed'
)
for assignment in assignments:
assignment.marked_count = Mark.objects.filter(expert=request.user, answer__assignment=assignment).count()
assignment.to_mark_count = assignment.available_answers(request.user).count()
for assignment in assignments:
assignment.marked_count = Mark.objects.filter(expert=request.user, answer__assignment=assignment).count()
assignment.to_mark_count = assignment.available_answers(request.user).count()
@@
-109,7
+109,7
@@
def available_answers(assignment, expert, answer_with_errors=None, form_with_err
def answer_list(request, assignment_id):
assignment = get_object_or_404(Assignment, id=assignment_id)
if request.user not in assignment.experts.all():
def answer_list(request, assignment_id):
assignment = get_object_or_404(Assignment, id=assignment_id)
if request.user not in assignment.experts.all():
- return HttpResponseForbidden()
+ return HttpResponseForbidden(
'Not allowed'
)
return render(request, 'stage2/answer_list.html',
{'answers': available_answers(assignment, request.user), 'assignment': assignment})
return render(request, 'stage2/answer_list.html',
{'answers': available_answers(assignment, request.user), 'assignment': assignment})
@@
-118,7
+118,7
@@
def answer_list(request, assignment_id):
def marked_answer_list(request, assignment_id):
assignment = get_object_or_404(Assignment, id=assignment_id)
if request.user not in assignment.experts.all():
def marked_answer_list(request, assignment_id):
assignment = get_object_or_404(Assignment, id=assignment_id)
if request.user not in assignment.experts.all():
- return HttpResponseForbidden()
+ return HttpResponseForbidden(
'Not allowed'
)
return render(request, 'stage2/answer_list.html', {
'answers': available_answers(assignment, request.user, marked=True),
'assignment': assignment,
return render(request, 'stage2/answer_list.html', {
'answers': available_answers(assignment, request.user, marked=True),
'assignment': assignment,
@@
-137,9
+137,9
@@
def expert_download(request, attachment_id):
def mark_answer(request, answer_id):
answer = get_object_or_404(Answer, id=answer_id)
if request.user not in answer.assignment.experts.all():
def mark_answer(request, answer_id):
answer = get_object_or_404(Answer, id=answer_id)
if request.user not in answer.assignment.experts.all():
- return HttpResponseForbidden()
+ return HttpResponseForbidden(
'Not allowed'
)
if answer.assignment.is_active():
if answer.assignment.is_active():
- return HttpResponseForbidden()
+ return HttpResponseForbidden(
'Not allowed'
)
mark, created = Mark.objects.get_or_create(answer=answer, expert=request.user, defaults={'points': 0})
form = MarkForm(data=request.POST, answer=answer, instance=mark, prefix='ans%s' % answer.id)
if form.is_valid():
mark, created = Mark.objects.get_or_create(answer=answer, expert=request.user, defaults={'points': 0})
form = MarkForm(data=request.POST, answer=answer, instance=mark, prefix='ans%s' % answer.id)
if form.is_valid():