Lack of information is better that untrue information

[edumed.git] / wtem / admin.py

diff --git a/wtem/admin.py b/wtem/admin.py
index dcf4558..ed72a83 100644 (file)
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -8,24 +8,27 @@ from django.utils import simplejson
 from django.utils.safestring import mark_safe
 from django.core.urlresolvers import reverse
 
 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
 
 
 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):
 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')
 
 class AttachmentWidget(forms.Widget):
     def render(self, name, value, *args, **kwargs):
 
 
 readonly_fields = ('submitted_by', 'first_name', 'last_name', 'email', 'key', 'key_sent')
 
 class AttachmentWidget(forms.Widget):
     def render(self, name, value, *args, **kwargs):

-        return mark_safe('<input type="hidden" name="%s" value="%s"/><a href="%s">%s</a>' % (name, value, value, value))
+        if value:
+            a_tag = '<a href="%s">%s</a>' % (value, value)
+        else:
+            a_tag = 'brak'
+        return mark_safe(('<input type="hidden" name="%s" value="%s"/>' + a_tag) % (name, value))

 
 class SubmissionFormBase(forms.ModelForm):
     class Meta:
 
 class SubmissionFormBase(forms.ModelForm):
     class Meta: