diff options
| author | Rob Austein <sra@hactrn.net> | 2014-04-07 22:00:09 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-04-07 22:00:09 +0000 |
| commit | 5c0340d79966f52bcb5ff180a96b576f450cbca6 (patch) | |
| tree | 8aa062eb6f722bbe04a474b07aa086f37a9914bd /rpki/gui/app/urls.py | |
| parent | 440687c9d13a28b902bd9594f88eea6f42be686e (diff) | |
| parent | 7970f9d6c64a6f32bd92d1b1739b44df8ff8a1ea (diff) | |
Pull tk674 changes from trunk. Required manual conflict resolution
because of tree changes in this (tk685) branch; with luck the
subversion mergeinfo will record what happened as I intended, but if
something horrible happens when this is merged back to trunk, you'll
know why. Manual diff of affected files against trunk looks good.
svn path=/branches/tk685/; revision=5766
Diffstat (limited to 'rpki/gui/app/urls.py')
| -rw-r--r-- | rpki/gui/app/urls.py | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/rpki/gui/app/urls.py b/rpki/gui/app/urls.py index 92e90b0e..a86611a7 100644 --- a/rpki/gui/app/urls.py +++ b/rpki/gui/app/urls.py @@ -78,4 +78,18 @@ urlpatterns = patterns( (r'^user/create$', views.user_create), (r'^user/(?P<pk>\d+)/delete$', views.user_delete), (r'^user/(?P<pk>\d+)/edit$', views.user_edit), + + url(r'^user/password/reset/$', + 'django.contrib.auth.views.password_reset', + #{'post_reset_redirect' : '/user/password/reset/done/'}, + {'extra_context': {'form_title': 'Password Reset'}}, + name="password_reset"), + (r'^user/password/reset/done/$', + 'django.contrib.auth.views.password_reset_done'), + url(r'^user/password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', + 'django.contrib.auth.views.password_reset_confirm', + #{'post_reset_redirect' : '/user/password/done/'}, + name="password_reset_confirm"), + (r'^user/password/done/$', + 'django.contrib.auth.views.password_reset_complete'), ) |