From 39937de7e60052d3ffa9f07fdbb9262aced35d61 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 5 Jun 2015 10:08:19 +0200 Subject: Fixed #24929 -- Allowed permission_required decorator to take any iterable --- docs/releases/1.9.txt | 4 ++++ docs/topics/auth/default.txt | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt index a3fb56c6c0..55906864ef 100644 --- a/docs/releases/1.9.txt +++ b/docs/releases/1.9.txt @@ -114,6 +114,10 @@ Minor features a deprecation warning in older versions and is no longer supported in Django 1.9). +* The permission argument of + :func:`~django.contrib.auth.decorators.permission_required()` accepts all + kinds of iterables, not only list and tuples. + :mod:`django.contrib.gis` ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt index 2df53816de..9e2d549fd1 100644 --- a/docs/topics/auth/default.txt +++ b/docs/topics/auth/default.txt @@ -580,7 +580,7 @@ The permission_required decorator (i.e. ``polls.can_vote`` for a permission on a model in the ``polls`` application). - The decorator may also take a list of permissions. + The decorator may also take an iterable of permissions. Note that :func:`~django.contrib.auth.decorators.permission_required()` also takes an optional ``login_url`` parameter. Example:: @@ -599,6 +599,11 @@ The permission_required decorator (HTTP Forbidden) view` instead of redirecting to the login page. + .. versionchanged:: 1.9 + + In older versions, the ``permission`` parameter only worked with + strings, lists, and tuples instead of strings and any iterable. + .. _applying-permissions-to-generic-views: Applying permissions to generic views -- cgit v1.3