summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-08-05 17:13:45 -0400
committerTim Graham <timograham@gmail.com>2015-08-05 17:18:13 -0400
commita7fb311aced5469dbf2588d860579be87b67e3d9 (patch)
treec981bbe647f228c6dcbc2e1a327027d781b8dce4
parentce0f2a4a4f192caf46cc9edd843c87862a668161 (diff)
[1.8.x] Fixed #25229 -- Clarified how an iterable works with @permission_required
Backport of 16a8d01308f8ca4a7b4673424059424ba3fe36c8 from master
-rw-r--r--docs/topics/auth/default.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 3699554e29..0ff763e064 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -595,7 +595,8 @@ The permission_required decorator
.. versionchanged:: 1.7
The :func:`~django.contrib.auth.decorators.permission_required`
- decorator can take a list of permissions as well as a single permission.
+ decorator can take a list of permissions, in which case the user must
+ have all of the permissions in order to access the view.
.. _applying-permissions-to-generic-views: