diff options
| author | prathamesh | 2014-09-23 14:53:15 +0530 |
|---|---|---|
| committer | prathamesh | 2014-09-23 14:53:15 +0530 |
| commit | d56b6501f6a2b9f9f39194e65fc15f901abf9b4d (patch) | |
| tree | 69c00b67dee0bb4435400bd42cf74a5c36760e5b /testapp/exam/urls.py | |
| parent | 5aab6280c2bc6e06577b69da3c31ea033061ed1e (diff) | |
| parent | e54137886164b2ef5ff03c24f301d7ddd80cca04 (diff) | |
| download | online_test-d56b6501f6a2b9f9f39194e65fc15f901abf9b4d.tar.gz online_test-d56b6501f6a2b9f9f39194e65fc15f901abf9b4d.tar.bz2 online_test-d56b6501f6a2b9f9f39194e65fc15f901abf9b4d.zip | |
Merge branch 'tomergewithmaster'
Diffstat (limited to 'testapp/exam/urls.py')
| -rw-r--r-- | testapp/exam/urls.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index f8a6cb8..d71329c 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -6,15 +6,15 @@ urlpatterns = patterns('testapp.exam.views', url(r'^quizzes/$','quizlist_user'), url(r'^results/$','results_user'), url(r'^start/$', 'start'), - url(r'^start/(?P<questionpaper_id>\d+)/$','start'), - url(r'^quit/(?P<questionpaper_id>\d+)/$', 'quit'), + url(r'^start/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$','start'), + url(r'^quit/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$', 'quit'), url(r'^intro/(?P<questionpaper_id>\d+)/$','intro'), url(r'^complete/$', 'complete'), - url(r'^complete/(?P<questionpaper_id>\d+)/$', 'complete'), + url(r'^complete/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$', 'complete'), url(r'^register/$', 'user_register'), url(r'^(?P<q_id>\d+)/$', 'question'), url(r'^(?P<q_id>\d+)/check/$', 'check'), - url(r'^(?P<q_id>\d+)/check/(?P<questionpaper_id>\d+)/$', 'check'), + url(r'^(?P<q_id>\d+)/check/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$', 'check'), url(r'^intro/$', 'start'), url(r'^manage/$', 'prof_manage'), |