Load exercises once, import when needed

[edumed.git] / wtem / admin.py

diff --git a/wtem/admin.py b/wtem/admin.py
index dcf4558..5c495ec 100644 (file)
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -8,14 +8,10 @@ from django.utils import simplejson
 from django.utils.safestring import mark_safe
 from django.core.urlresolvers import reverse
 
-from .models import Submission, Assignment, Attachment
+from .models import Submission, Assignment, Attachment, exercises
 from .middleware import get_current_request
 
 
-f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')
-exercises = simplejson.loads(f.read())
-f.close()
-
 def get_user_exercises(user):
     assignment = Assignment.objects.get(user = user)
     return [e for e in exercises if e['id'] in assignment.exercises]