diff options
| author | adityacp | 2016-04-15 18:47:01 +0530 |
|---|---|---|
| committer | adityacp | 2016-04-15 18:47:01 +0530 |
| commit | 09e77a6065f019fe9b9d00fbedce2c11188e4589 (patch) | |
| tree | 209a6b0f3deede63677a77b586179d6d355a2c6e /yaksh/urls.py | |
| parent | 351203587422455d803a2b92296cb8e7a8ba59a9 (diff) | |
| download | online_test-09e77a6065f019fe9b9d00fbedce2c11188e4589.tar.gz online_test-09e77a6065f019fe9b9d00fbedce2c11188e4589.tar.bz2 online_test-09e77a6065f019fe9b9d00fbedce2c11188e4589.zip | |
changes after rebase
Diffstat (limited to 'yaksh/urls.py')
| -rw-r--r-- | yaksh/urls.py | 10 |
1 files changed, 7 insertions, 3 deletions
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<course_id>\d+)', views.enroll) -]
\ No newline at end of file + url(r'^manage/enroll/(?P<course_id>\d+)/$', views.enroll), + url(r'manage/enroll/rejected/(?P<course_id>\d+)/$', + views.enroll, {'was_rejected': True}), + url(r'manage/enrolled/reject/(?P<course_id>\d+)/$', + views.reject, {'was_enrolled': True}) +] |