[1.9.x] Fixed #25169 -- Documented stacking of permission_required and login_required.

Backport of 9788625277 from master
This commit is contained in:
Bryan Marty 2015-10-30 13:26:09 -07:00 committed by Tim Graham
parent 16865782d7
commit 8e23527075
1 changed files with 11 additions and 0 deletions

View File

@ -688,6 +688,17 @@ The ``permission_required`` decorator
(HTTP Forbidden) view<http_forbidden_view>` instead of redirecting to the
login page.
If you want to use ``raise_exception`` but also give your users a chance to
login first, you can add the
:func:`~django.contrib.auth.decorators.login_required` decorator::
from django.contrib.auth.decorators import login_required, permission_required
@permission_required('polls.can_vote', raise_exception=True)
@login_required
def my_view(request):
...
.. versionchanged:: 1.9
In older versions, the ``permission`` parameter only worked with