Open images in a new tab

[edumed.git] / wtem / views.py

diff --git a/wtem/views.py b/wtem/views.py
index 896746a..551a781 100644 (file)
--- a/wtem/views.py
+++ b/wtem/views.py
@@ -3,9 +3,9 @@ import os
 from django.shortcuts import render
 from django.utils import simplejson
 from django.conf import settings
-from django.http import Http404
+from django.http import Http404, HttpResponseForbidden
 
-from .models import Submission, DEBUG_KEY
+from .models import Submission, DEBUG_KEY, exercises
 from .forms import WTEMForm
 
 WTEM_CONTEST_STAGE = getattr(settings, 'WTEM_CONTEST_STAGE', 'before')
@@ -24,7 +24,7 @@ def form_during(request, key):
 
     if WTEM_CONTEST_STAGE != 'during':
         if request.META['REMOTE_ADDR'] != getattr(settings, 'WTEM_CONTEST_IP_ALLOW', 'xxx'):
-            raise Http404
+            return HttpResponseForbidden('Not allowed')
 
     try:
         submission = Submission.objects.get(key = key)
@@ -33,12 +33,6 @@ def form_during(request, key):
             submission = Submission.create(first_name = 'Debug', last_name = 'Debug', email = 'debug@debug.com', key = DEBUG_KEY)
         else:
             raise Http404
-
-    ## @@ move this out of the view
-    f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')
-    exercises = simplejson.loads(f.read())
-    f.close()
-
     if request.method == 'GET':
         return render(request, 'wtem/main.html', dict(exercises = exercises))
     elif request.method == 'POST':