diff options
| author | prathamesh | 2017-10-26 14:46:14 +0530 |
|---|---|---|
| committer | prathamesh | 2017-10-26 14:46:14 +0530 |
| commit | 8dc6f2c9271e2e2aef9c30594df85af8b24aeeb4 (patch) | |
| tree | d3c9d2ef6afbfb5307fb2b4b9e867253da98eacf /yaksh/urls.py | |
| parent | 1f554e7505f5a6aa1b796b2e31e1541188af56da (diff) | |
| parent | 840c00b9e939d2b33058d236ef4170923e0a018b (diff) | |
| download | online_test-8dc6f2c9271e2e2aef9c30594df85af8b24aeeb4.tar.gz online_test-8dc6f2c9271e2e2aef9c30594df85af8b24aeeb4.tar.bz2 online_test-8dc6f2c9271e2e2aef9c30594df85af8b24aeeb4.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into detailed_csv_download_quiz
RESOLVED
Conflicts:
yaksh/test_models.py
Diffstat (limited to 'yaksh/urls.py')
| -rw-r--r-- | yaksh/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py index 849a810..9288956 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -100,7 +100,7 @@ urlpatterns = [ views.regrade, name='regrade'), url(r'^manage/regrade/paper/(?P<course_id>\d+)/(?P<answerpaper_id>\d+)/$', views.regrade, name='regrade'), - url(r'^manage/(?P<mode>[\w\-]+)/(?P<quiz_id>\d+)/$', views.test_quiz), + url(r'^manage/(?P<mode>godmode|usermode)/(?P<quiz_id>\d+)/$', views.test_quiz), url(r'^manage/create_demo_course/$', views.create_demo_course), url(r'^manage/courses/download_course_csv/(?P<course_id>\d+)/$', views.download_course_csv, name="download_course_csv"), |