summaryrefslogtreecommitdiff
path: root/yaksh/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'yaksh/urls.py')
-rw-r--r--yaksh/urls.py34
1 files changed, 21 insertions, 13 deletions
diff --git a/yaksh/urls.py b/yaksh/urls.py
index b530e99..0639b25 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -123,30 +123,38 @@ urlpatterns = [
name='edit_course'),
url(r'manage/course_detail/(?P<course_id>\d+)/$', views.course_detail,
name='course_detail'),
- url(r'manage/enroll/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.enroll,
- name="enroll_user"),
+
+ url(r'manage/enroll/(?P<course_id>\d+)/$', views.enroll_reject_user,
+ name="enroll_reject_user"),
+ url(r'manage/enroll/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
+ views.enroll_user, name="enroll_user"),
+ url(r'manage/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
+ views.reject_user, name="reject_user"),
+ url(r'manage/enrolled/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
+ views.reject_user, {'was_enrolled': True},
+ name="reject_enrolled_user"),
+ url(r'manage/enrolled/reject/(?P<course_id>\d+)/$',
+ views.enroll_reject_user, {'was_enrolled': True},
+ name="reject_enrolled_users"),
url(r'manage/enroll/rejected/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
- views.enroll, {'was_rejected': True}, name="enroll_rejected"),
+ views.enroll_user, {'was_rejected': True},
+ name="enroll_rejected_user"),
+ url(r'manage/enroll/rejected/(?P<course_id>\d+)/$',
+ views.enroll_reject_user, {'was_rejected': True},
+ name="enroll_rejected_users"),
+
url(r'manage/upload_users/(?P<course_id>\d+)/$', views.upload_users,
name="upload_users"),
url(r'manage/send_mail/(?P<course_id>\d+)/$', views.send_mail,
name="send_mail"),
- url(r'manage/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$', views.reject,
- name="reject_user"),
- url(r'manage/enrolled/reject/(?P<course_id>\d+)/(?P<user_id>\d+)/$',
- 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'^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'),
- url(r'^manage/enroll/(?P<course_id>\d+)/$', views.enroll,
- name="enroll_users"),
- url(r'manage/enroll/rejected/(?P<course_id>\d+)/$',
- views.enroll, {'was_rejected': True}, name="enroll_rejected"),
- url(r'manage/enrolled/reject/(?P<course_id>\d+)/$',
- views.reject, {'was_enrolled': True}, name="reject_users"),
+
url(r'^manage/searchteacher/(?P<course_id>\d+)/$', views.search_teacher,
name="search_teacher"),
url(r'^manage/addteacher/(?P<course_id>\d+)/$', views.add_teacher,