diff options
| author | adityacp | 2020-04-21 12:53:54 +0530 |
|---|---|---|
| committer | adityacp | 2020-04-21 12:53:54 +0530 |
| commit | e3f73db877aaf2f6406bef39aee590530bcb503b (patch) | |
| tree | 122c11b17c64ba8a191a4d50645f6762dad684fc /yaksh/urls.py | |
| parent | a8c881326894ee9cfd008eb971f3079d62bee6d6 (diff) | |
| parent | 01c9faa0abeedb748600c35a35bd6cf8124bd64d (diff) | |
| download | online_test-e3f73db877aaf2f6406bef39aee590530bcb503b.tar.gz online_test-e3f73db877aaf2f6406bef39aee590530bcb503b.tar.bz2 online_test-e3f73db877aaf2f6406bef39aee590530bcb503b.zip | |
Resolve conflicts in urls
Diffstat (limited to 'yaksh/urls.py')
| -rw-r--r-- | yaksh/urls.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py index 52c196b..30adefc 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -125,7 +125,7 @@ urlpatterns = [ views.reject, {'was_enrolled': True}, name="reject_user"), url(r'manage/toggle_status/(?P<course_id>\d+)/$', views.toggle_course_status, name="toggle_course_status"), - url(r'^ajax/questions/filter/$', views.ajax_questions_filter, + url(r'^questions/filter$', views.questions_filter, name="questions_filter"), url(r'^editprofile/$', views.edit_profile, name='edit_profile'), url(r'^viewprofile/$', views.view_profile, name='view_profile'), @@ -203,6 +203,14 @@ urlpatterns = [ views.course_teachers, name="course_teachers"), url(r'^manage/download/course/progress/(?P<course_id>\d+)', views.download_course_progress, name="download_course_progress"), + url(r'^manage/question/download/(?P<question_id>\d+)', + views.download_question, name="download_question"), + url(r'^manage/question/test/(?P<question_id>\d+)', + views.test_question, name="test_question"), + url(r'^manage/question/delete/(?P<question_id>\d+)', + views.delete_question, name="delete_question"), + url(r'^manage/search/questions', views.search_questions_by_tags, + name="search_questions_by_tags"), path('view/notifications', views.view_notifications, name="view_notifications"), path('mark/notifications/<uuid:message_uid>', |