X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/c99e78247b06e2c73348db14c37baa9c87c04e74..db84146fd291bfa7a9209939348b7932eefa3a06:/wtem/admin.py?ds=inline

diff --git a/wtem/admin.py b/wtem/admin.py
index dcf4558..47e0a77 100644
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -8,17 +8,16 @@ 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]
+    try:
+        assignment = Assignment.objects.get(user = user)
+        return [e for e in exercises if e['id'] in assignment.exercises]
+    except Assignment.DoesNotExist:
+        return []
 
 
 readonly_fields = ('submitted_by', 'first_name', 'last_name', 'email', 'key', 'key_sent')