test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved 'User-requested password resets' docs from [17266] from auth docs to admin docs 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2011-12-30 20:23:26 +00:00
parent f2dcca6631
commit 103890561b
2 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
docs/ref/contrib/admin/index.txt
View File

@ -1928,6 +1928,31 @@ a pattern for your new view.
be set to either ``self.name`` if your view is on an ``AdminSite`` or be set to either ``self.name`` if your view is on an ``AdminSite`` or
``self.admin_site.name`` if your view is on a ``ModelAdmin``. ``self.admin_site.name`` if your view is on a ``ModelAdmin``.
.. _auth_password_reset:
Adding a password-reset feature
-------------------------------
You can add a password-reset feature to the admin site by adding a few lines to
your URLconf. Specifically, add these four patterns:
.. code-block:: python
url(r'^admin/password_reset/$', 'django.contrib.auth.views.password_reset', name='admin_password_reset'),
(r'^admin/password_reset/done/$', 'django.contrib.auth.views.password_reset_done'),
(r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm'),
(r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete'),
(This assumes you've added the admin at ``admin/`` and requires that you put
the URLs starting with ``^admin/`` before the line that includes the admin app
itself).
.. versionchanged:: 1.4
The presence of the ``admin_password_reset`` named URL will cause a "forgotten
your password?" link to appear on the default admin log-in page under the
password box.
.. _admin-reverse-urls: .. _admin-reverse-urls:
Reversing admin URLs Reversing admin URLs

28
docs/topics/auth.txt
View File

@ -371,34 +371,6 @@ Don't set the :attr:`~django.contrib.auth.models.User.password` attribute
directly unless you know what you're doing. This is explained in the next directly unless you know what you're doing. This is explained in the next
section. section.
.. _auth_password_reset:
User-requested password resets
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
There is a bundled reset mechanism that integrates into the admin, allowing
users to reset their passwords by email. It can be customized and is described
in detail below under :func:`~django.contrib.auth.views.password_reset`. To
enable it without customization, add lines something like the following to your
urls.py:
.. code-block:: python
url(r'^admin/password_reset/$', 'django.contrib.auth.views.password_reset', name='admin_password_reset'),
(r'^admin/password_reset/done/$', 'django.contrib.auth.views.password_reset_done'),
(r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm'),
(r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete'),
(This assumes you've added the admin at ``admin/``, and requires that you put
the URLs starting with ``^admin/`` before the line that includes the admin app
itself).
.. versionchanged:: 1.4
The presence of the 'admin_password_reset' named URL will cause a "forgotten
your password?" link to appear on the default admin login page under the
password box.
.. _auth_password_storage: .. _auth_password_storage:
How Django stores passwords How Django stores passwords