diff options
| author | Hardik Ghaghada | 2013-04-26 14:02:28 +0530 |
|---|---|---|
| committer | Hardik Ghaghada | 2013-04-26 14:02:28 +0530 |
| commit | 340e9b28961a4a927e9f039a5cef7111bbf69bf0 (patch) | |
| tree | 056d7b16a104ce7afd375505feab7a879d3f7f99 /testapp/exam/urls.py | |
| parent | ca63599e6fecbd513d47092f5aeb03726024bd98 (diff) | |
| parent | 29beb24fe345e7e20919a6122ffb3e0f13371143 (diff) | |
| download | online_test-340e9b28961a4a927e9f039a5cef7111bbf69bf0.tar.gz online_test-340e9b28961a4a927e9f039a5cef7111bbf69bf0.tar.bz2 online_test-340e9b28961a4a927e9f039a5cef7111bbf69bf0.zip | |
Resolved Conflicts
Diffstat (limited to 'testapp/exam/urls.py')
| -rw-r--r-- | testapp/exam/urls.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index ff1545a..b3cfceb 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -30,15 +30,17 @@ urlpatterns = patterns('exam.views', url(r'^manage/showquiz/$','show_all_quiz'), url(r'^manage/monitor/$', 'monitor'), url(r'^manage/showquestionpapers/$','show_all_questionpapers'), - url(r'^manage/showquestionpapers/(?P<questionpaper_id>\d+)/$', 'show_all_questionpapers'), + url(r'^manage/showquestionpapers/(?P<questionpaper_id>\d+)/$',\ + 'show_all_questionpapers'), url(r'^manage/monitor/(?P<quiz_id>\d+)/$', 'monitor'), - url(r'^manage/user_data/(?P<username>[a-zA-Z0-9_.]+)/$', 'user_data'), + url(r'^manage/user_data/(?P<username>[a-zA-Z0-9_.]+)/$','user_data'), url(r'^manage/designquestionpaper/$','design_questionpaper'), - url(r'^manage/designquestionpaper/(?P<questionpaper_id>\d+)/$', 'design_questionpaper'), - url(r'^manage/designquestionpaper/automatic/(?P<questionpaper_id>\d+)/$','automatic_questionpaper'), + url(r'^manage/designquestionpaper/(?P<questionpaper_id>\d+)/$',\ + 'design_questionpaper'), + url(r'^manage/designquestionpaper/automatic/(?P<questionpaper_id>\d+)/$',\ + 'automatic_questionpaper'), url(r'^manage/designquestionpaper/automatic$','automatic_questionpaper'), url(r'^manage/designquestionpaper/manual$','manual_questionpaper'), - url(r'^manage/designquestionpaper/manual/(?P<questionpaper_id>\d+)/$','manual_questionpaper'), - + url(r'^manage/designquestionpaper/manual/(?P<questionpaper_id>\d+)/$',\ + 'manual_questionpaper'), ) - |