From 234cf831861045796a7bcf4e08a46b0c38016f75 Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 23 Mar 2016 11:14:47 +0530 Subject: EditProfile, ChangePassword, StudentsEnrollment facility --- yaksh/urls.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index b2f894f..584064d 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -1,7 +1,8 @@ from django.conf.urls import patterns, url from yaksh import views from django.contrib.auth.views import password_reset, password_reset_confirm,\ - password_reset_done, password_reset_complete + password_reset_done, password_reset_complete, password_change,\ + password_change_done urlpatterns = [ url(r'^forgotpassword/$', password_reset, name="password_reset"), @@ -11,6 +12,8 @@ urlpatterns = [ name='password_reset_done'), url(r'^password_reset/complete/$', password_reset_complete, name='password_reset_complete'), + url(r'^changepassword/$', 'password_change', name='password_change'), + url(r'^password_change/done/$', 'password_change_done', name='password_change_done'), ] urlpatterns += [ url(r'^$', views.index), @@ -34,7 +37,6 @@ urlpatterns += [ views.skip), url(r'^enroll_request/(?P\d+)/$', views.enroll_request), url(r'^self_enroll/(?P\d+)/$', views.self_enroll), - url(r'^manage/$', views.prof_manage), url(r'^manage/addquestion/$', views.add_question), url(r'^manage/addquestion/(?P\d+)/$', views.add_question), @@ -74,4 +76,8 @@ urlpatterns += [ url(r'manage/toggle_status/(?P\d+)/$', views.toggle_course_status), url(r'^ajax/questionpaper/(?P.+)/$', views.ajax_questionpaper), url(r'^ajax/questions/filter/$', views.ajax_questions_filter), + url(r'^manage/editprofile/$', views.edit_profile), + url(r'^manage/viewprofile/$', views.view_profile), + url(r'^manage/enroll/(?P\d+)', views.enroll) ] + -- cgit From c140d65ab1a3c4faa97789e08223d563cf283d25 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 31 Mar 2016 19:42:44 +0530 Subject: changes in edit profile, enrollment, change password --- yaksh/urls.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 584064d..ab9f90a 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -12,8 +12,10 @@ urlpatterns = [ name='password_reset_done'), url(r'^password_reset/complete/$', password_reset_complete, name='password_reset_complete'), - url(r'^changepassword/$', 'password_change', name='password_change'), - url(r'^password_change/done/$', 'password_change_done', name='password_change_done'), + url(r'^password_change/$', password_change, + name='password_change'), + url(r'^password_change/done/$', password_change_done, + name='password_change_done'), ] urlpatterns += [ url(r'^$', views.index), @@ -79,5 +81,4 @@ urlpatterns += [ url(r'^manage/editprofile/$', views.edit_profile), url(r'^manage/viewprofile/$', views.view_profile), url(r'^manage/enroll/(?P\d+)', views.enroll) -] - +] \ No newline at end of file -- cgit From 09e77a6065f019fe9b9d00fbedce2c11188e4589 Mon Sep 17 00:00:00 2001 From: adityacp Date: Fri, 15 Apr 2016 18:47:01 +0530 Subject: changes after rebase --- yaksh/urls.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index ab9f90a..f1a0cf0 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -12,7 +12,7 @@ urlpatterns = [ name='password_reset_done'), url(r'^password_reset/complete/$', password_reset_complete, name='password_reset_complete'), - url(r'^password_change/$', password_change, + url(r'^changepassword/$', password_change, name='password_change'), url(r'^password_change/done/$', password_change_done, name='password_change_done'), @@ -80,5 +80,9 @@ urlpatterns += [ url(r'^ajax/questions/filter/$', views.ajax_questions_filter), url(r'^manage/editprofile/$', views.edit_profile), url(r'^manage/viewprofile/$', views.view_profile), - url(r'^manage/enroll/(?P\d+)', views.enroll) -] \ No newline at end of file + url(r'^manage/enroll/(?P\d+)/$', views.enroll), + url(r'manage/enroll/rejected/(?P\d+)/$', + views.enroll, {'was_rejected': True}), + url(r'manage/enrolled/reject/(?P\d+)/$', + views.reject, {'was_enrolled': True}) +] -- cgit From 975e74ab737cfc5d9c5375931170cdc9ecb75b40 Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 18 Apr 2016 19:09:22 +0530 Subject: changes for profile edit --- yaksh/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index f1a0cf0..471a36b 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -78,8 +78,8 @@ urlpatterns += [ url(r'manage/toggle_status/(?P\d+)/$', views.toggle_course_status), url(r'^ajax/questionpaper/(?P.+)/$', views.ajax_questionpaper), url(r'^ajax/questions/filter/$', views.ajax_questions_filter), - url(r'^manage/editprofile/$', views.edit_profile), - url(r'^manage/viewprofile/$', views.view_profile), + url(r'^editprofile/$', views.edit_profile), + url(r'^viewprofile/$', views.view_profile), url(r'^manage/enroll/(?P\d+)/$', views.enroll), url(r'manage/enroll/rejected/(?P\d+)/$', views.enroll, {'was_rejected': True}), -- cgit