fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove banners
[edumed.git]
/
wtem
/
forms.py
diff --git
a/wtem/forms.py
b/wtem/forms.py
index
8cdfe79
..
ae406a3
100644
(file)
--- a/
wtem/forms.py
+++ b/
wtem/forms.py
@@
-1,8
+1,7
@@
-import os
+# -*- coding: utf-8 -*-
import re
from django import forms
import re
from django import forms
-from django.utils import simplejson
from .models import Submission, Attachment, exercises
from .models import Submission, Attachment, exercises
@@
-17,18
+16,17
@@
class WTEMForm(forms.ModelForm):
for exercise in exercises:
if exercise['type'] != 'file_upload':
continue
for exercise in exercises:
if exercise['type'] != 'file_upload':
continue
- self.fields['attachment_for_' + str(exercise['id'])] = forms.FileField(required
=
False)
+ self.fields['attachment_for_' + str(exercise['id'])] = forms.FileField(required
=
False)
- def save(self):
- submission = super(WTEMForm, self).save()
- for name, file in self.files.items():
+ def save(self
, commit=True
):
+ submission = super(WTEMForm, self).save(
commit=commit
)
+ for name,
attachment_
file in self.files.items():
m = re.match(r'attachment_for_(\d+)(?:__(.*))?', name)
exercise_id = int(m.group(1))
tag = m.group(2) or None
try:
m = re.match(r'attachment_for_(\d+)(?:__(.*))?', name)
exercise_id = int(m.group(1))
tag = m.group(2) or None
try:
- attachment = Attachment.objects.get(submission
= submission, exercise_id =
exercise_id, tag=tag)
+ attachment = Attachment.objects.get(submission
=submission, exercise_id=
exercise_id, tag=tag)
except Attachment.DoesNotExist:
except Attachment.DoesNotExist:
- attachment = Attachment(submission
= submission, exercise_id =
exercise_id, tag=tag)
- attachment.file = file
+ attachment = Attachment(submission
=submission, exercise_id=
exercise_id, tag=tag)
+ attachment.file =
attachment_
file
attachment.save()
attachment.save()
-