diff options
| author | adityacp | 2018-03-22 12:36:45 +0530 |
|---|---|---|
| committer | adityacp | 2018-03-22 12:36:45 +0530 |
| commit | 30be89eef46a248fe6f7ff26a923593ea8371fb1 (patch) | |
| tree | 7af1afd0a403e4c71579f9afe830c482e59c3add /yaksh/urls.py | |
| parent | e1c1d0d0d6ae170d3ce9966b98ec6d03ff35c062 (diff) | |
| parent | 4b356aa2f6097cd0f46292218f31ded18b631e53 (diff) | |
| download | online_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.tar.gz online_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.tar.bz2 online_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.zip | |
Resolve conflicts and update to latest changes
Diffstat (limited to 'yaksh/urls.py')
| -rw-r--r-- | yaksh/urls.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py index 08c2091..dd450ba 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -86,8 +86,8 @@ urlpatterns = [ views.show_statistics, name="show_statistics"), url(r'^manage/download_quiz_csv/(?P<course_id>\d+)/(?P<quiz_id>\d+)/$', views.download_quiz_csv, name="download_quiz_csv"), - url(r'^manage/duplicate_course/(?P<course_id>\d+)/$', views.duplicate_course, - name='duplicate_course'), + url(r'^manage/duplicate_course/(?P<course_id>\d+)/$', + views.duplicate_course, name='duplicate_course'), url(r'manage/courses/$', views.courses, name='courses'), url(r'manage/add_course/$', views.add_course, name='add_course'), url(r'manage/edit_course/(?P<course_id>\d+)$', views.add_course, name='edit_course'), @@ -172,4 +172,6 @@ urlpatterns = [ views.design_course, name="design_course"), url(r'^manage/course_status/(?P<course_id>\d+)/$', views.course_status, name="course_status"), + url(r'^manage/preview_questionpaper/(?P<questionpaper_id>\d+)/$', + views.preview_questionpaper, name="preview_questionpaper"), ] |