From 66c881ff2769560258b3d72a12aedd0df17b9d27 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Wed, 6 May 2020 21:24:37 +0530
Subject: Add Reject button to reject selected students

 - A reject button to reject selected students in Enroll Students
   page on a Requested Students tab.
 - Improve the views and urls for enrolling and rejecting students
   in the course.
---
 yaksh/urls.py | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 149e4d6..97bd42e 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -122,30 +122,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,
-- 
cgit 


From 9a8330b74c9ee0ddf8720a7326a699ba32922575 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Sat, 9 May 2020 17:42:01 +0530
Subject: Fix pep8

 - cover missing tests.
---
 yaksh/urls.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 97bd42e..88f34b3 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -122,9 +122,9 @@ 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+)/$', views.enroll_reject_user,
-        name="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+)/$',
@@ -146,14 +146,14 @@ urlpatterns = [
         name="upload_users"),
     url(r'manage/send_mail/(?P<course_id>\d+)/$', views.send_mail,
         name="send_mail"),
-    
+
     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/searchteacher/(?P<course_id>\d+)/$', views.search_teacher,
         name="search_teacher"),
     url(r'^manage/addteacher/(?P<course_id>\d+)/$', views.add_teacher,
-- 
cgit