diff options
| author | prathamesh | 2016-11-01 09:30:53 +0530 |
|---|---|---|
| committer | prathamesh | 2016-11-01 09:30:53 +0530 |
| commit | 6f9d5d2779e64212988c0d164fa05ce2d05e696a (patch) | |
| tree | e7a1c316b97df44ec701384feea421ca66e3aa9c /yaksh/urls.py | |
| parent | 3b66e5fb8af12ce756f34966bb684373062551dd (diff) | |
| parent | f563640af941a50642dc5eb6e63b1d63a1685046 (diff) | |
| download | online_test-6f9d5d2779e64212988c0d164fa05ce2d05e696a.tar.gz online_test-6f9d5d2779e64212988c0d164fa05ce2d05e696a.tar.bz2 online_test-6f9d5d2779e64212988c0d164fa05ce2d05e696a.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into UI-modifications
Resolved
Conflicts:
yaksh/templates/manage.html
yaksh/templates/yaksh/design_questionpaper.html
Diffstat (limited to 'yaksh/urls.py')
| -rw-r--r-- | yaksh/urls.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py index c4619b6..bb8cf2e 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -68,9 +68,10 @@ urlpatterns += [ url(r'^manage/user_data/(?P<user_id>\d+)/(?P<questionpaper_id>\d+)/$', views.user_data), url(r'^manage/user_data/(?P<user_id>\d+)/$', views.user_data), - url(r'^manage/designquestionpaper/$', views.design_questionpaper, name='design_questionpaper'), - url(r'^manage/designquestionpaper/(?P<questionpaper_id>\d+)/$',\ - views.design_questionpaper), + url(r'^manage/quiz/designquestionpaper/(?P<quiz_id>\d+)/$', views.design_questionpaper, + name='design_questionpaper'), + url(r'^manage/designquestionpaper/(?P<quiz_id>\d+)/(?P<questionpaper_id>\d+)/$', + views.design_questionpaper, name='designquestionpaper'), url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/$', views.show_statistics), url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/(?P<attempt_number>\d+)/$', @@ -87,7 +88,6 @@ urlpatterns += [ url(r'manage/enrolled/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.reject, {'was_enrolled': True}), url(r'manage/toggle_status/(?P<course_id>\d+)/$', views.toggle_course_status), - url(r'^ajax/questionpaper/(?P<query>.+)/$', views.ajax_questionpaper), url(r'^ajax/questions/filter/$', views.ajax_questions_filter), url(r'^editprofile/$', views.edit_profile, name='edit_profile'), url(r'^viewprofile/$', views.view_profile, name='view_profile'), |