fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo in translation
[edumed.git]
/
wtem
/
views.py
diff --git
a/wtem/views.py
b/wtem/views.py
index
546ec5b
..
33ac1e2
100644
(file)
--- a/
wtem/views.py
+++ b/
wtem/views.py
@@
-1,13
+1,13
@@
-import os
+# -*- coding: utf-8 -*-
-from django.shortcuts import render
-from django.utils import simplejson
from django.conf import settings
from django.conf import settings
-from django.http import Http404, HttpResponseForbidden
+from django.http import HttpResponseForbidden
+from django.shortcuts import render
+from django.views.decorators.cache import never_cache
from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.csrf import csrf_exempt
-from .models import Submission, DEBUG_KEY, exercises
from .forms import WTEMForm
from .forms import WTEMForm
+from .models import Submission, DEBUG_KEY, exercises
WTEM_CONTEST_STAGE = getattr(settings, 'WTEM_CONTEST_STAGE', 'before')
WTEM_CONTEST_STAGE = getattr(settings, 'WTEM_CONTEST_STAGE', 'before')
@@
-15,33
+15,43
@@
WTEM_CONTEST_STAGE = getattr(settings, 'WTEM_CONTEST_STAGE', 'before')
@csrf_exempt
def form(request, key):
return globals()['form_' + WTEM_CONTEST_STAGE](request, key)
@csrf_exempt
def form(request, key):
return globals()['form_' + WTEM_CONTEST_STAGE](request, key)
-
+
+
def form_before(request, key):
def form_before(request, key):
- return render(request, 'wtem/main_before.html')
+ try:
+ Submission.objects.get(key=key)
+ except Submission.DoesNotExist:
+ return render(request, 'wtem/key_not_found_before.html')
+ else:
+ return render(request, 'wtem/main_before.html')
+
def form_after(request, key):
return render(request, 'wtem/main_after.html')
def form_after(request, key):
return render(request, 'wtem/main_after.html')
+
+@never_cache
@csrf_exempt
def form_during(request, key):
if WTEM_CONTEST_STAGE != 'during':
@csrf_exempt
def form_during(request, key):
if WTEM_CONTEST_STAGE != 'during':
- if request.META['REMOTE_ADDR']
!= getattr(settings, 'WTEM_CONTEST_IP_ALLOW', 'xxx'
):
+ if request.META['REMOTE_ADDR']
not in getattr(settings, 'WTEM_CONTEST_IP_ALLOW', []
):
return HttpResponseForbidden('Not allowed')
try:
return HttpResponseForbidden('Not allowed')
try:
- submission = Submission.objects.get(key
=
key)
+ submission = Submission.objects.get(key
=
key)
except Submission.DoesNotExist:
if settings.DEBUG and key == DEBUG_KEY:
except Submission.DoesNotExist:
if settings.DEBUG and key == DEBUG_KEY:
- submission = Submission.create(first_name = 'Debug', last_name = 'Debug', email = 'debug@debug.com', key = DEBUG_KEY)
+ submission = Submission.create(
+ first_name='Debug', last_name='Debug', email='debug@debug.com', key=DEBUG_KEY)
else:
return render(request, 'wtem/key_not_found.html')
if request.method == 'GET':
else:
return render(request, 'wtem/key_not_found.html')
if request.method == 'GET':
- return render(request, 'wtem/main.html', dict(exercises
= exercises, end_time =
submission.end_time))
+ return render(request, 'wtem/main.html', dict(exercises
=exercises, end_time=
submission.end_time))
elif request.method == 'POST':
elif request.method == 'POST':
- form = WTEMForm(request.POST, request.FILES, instance
=
submission)
+ form = WTEMForm(request.POST, request.FILES, instance
=
submission)
if form.is_valid():
form.save()
if form.is_valid():
form.save()
- return render(request, 'wtem/thanks.html', dict(end_time
=
submission.end_time))
+ return render(request, 'wtem/thanks.html', dict(end_time
=
submission.end_time))
else:
raise Exception
else:
raise Exception