diff options
| author | adityacp | 2017-06-13 16:29:12 +0530 |
|---|---|---|
| committer | adityacp | 2017-06-13 16:29:12 +0530 |
| commit | 18fff6daed3d57471514fdf189c60865838d43ee (patch) | |
| tree | c8cb2fa842d5540989cd11a6c56a13bff38813d0 /yaksh/models.py | |
| parent | 3552f4bc8082fc3ecc5290029cac6a839cd3b247 (diff) | |
| parent | ebc8a2af6d4fdf52a9703701a97a3abfaf66ed06 (diff) | |
| download | online_test-18fff6daed3d57471514fdf189c60865838d43ee.tar.gz online_test-18fff6daed3d57471514fdf189c60865838d43ee.tar.bz2 online_test-18fff6daed3d57471514fdf189c60865838d43ee.zip | |
Resolve conflicts with latest changes
Diffstat (limited to 'yaksh/models.py')
| -rw-r--r-- | yaksh/models.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/yaksh/models.py b/yaksh/models.py index 79732cc..2fa34e4 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -78,9 +78,10 @@ test_status = ( def get_assignment_dir(instance, filename): + upload_dir = instance.question_paper.quiz.description.replace(" ", "_") return os.sep.join(( - instance.question_paper.quiz.description, instance.user.username, - str(instance.assignmentQuestion.id), filename + upload_dir, instance.user.username, str(instance.assignmentQuestion.id), + filename )) |