Ticket #903: patch_login_required.diff

django/contrib/auth/decorators.py

@@ -17 +17 @@
         return _CheckLogin(view_func, test_func, login_url, redirect_field_name)
     return decorate
 
-def login_required(function=None, redirect_field_name=REDIRECT_FIELD_NAME):
+def login_required(function=None, redirect_field_name=REDIRECT_FIELD_NAME, login_url=None):
     """
     Decorator for views that checks that the user is logged in, redirecting
     to the log-in page if necessary.
     """
     actual_decorator = user_passes_test(
         lambda u: u.is_authenticated(),
-        redirect_field_name=redirect_field_name
+        login_url,
+        redirect_field_name
     )
     if function:
         return actual_decorator(function)
     return actual_decorator
 
-def permission_required(perm, login_url=None):
+def permission_required(perm, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME):
     """
     Decorator for views that checks whether a user has a particular permission
     enabled, redirecting to the log-in page if necessary.
     """
-    return user_passes_test(lambda u: u.has_perm(perm), login_url=login_url)
+    return user_passes_test(lambda u: u.has_perm(perm), login_url, redirect_field_name)
 
 class _CheckLogin(object):
     """

docs/topics/auth.txt

@@ -673 +673 @@
         @login_required(redirect_field_name='redirect_to')
         def my_view(request):
             # ...
+    
+    :func:`~django.contrib.auth.decorators.login_required` also takes an
+    optional ``login_url`` argument, which lets you specify the URL for
+    your login page (settings.LOGIN_URL by default).
+    
+    Example in Python 2.3 syntax::
+    
+        from django.contrib.auth.decorators import login_required
+        
+        def my_view(request):
+            # ...
+        my_view = login_required(login_url='/login/')(my_view)
+    
+    Example in Python 2.4 syntax::
+    
+        from django.contrib.auth.decorators import login_required
+        
+        @login_required(login_url='/login/')
+        def my_view(request):
+            # ...
 
     :func:`~django.contrib.auth.decorators.login_required` does the following:
 
-        * If the user isn't logged in, redirect to
-          :setting:`settings.LOGIN_URL <LOGIN_URL>` (``/accounts/login/`` by
-          default), passing the current absolute URL in the query string as
-          ``next`` or the value of ``redirect_field_name``. For example:
+        * If the user isn't logged in, redirect to ``login_url`` value, wich
+          defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>`
+          (``/accounts/login/`` by default), passing the current absolute URL
+          in the query string as ``next`` or the value of 
+          ``redirect_field_name``. For example: 
           ``/accounts/login/?next=/polls/3/``.
 
         * If the user is logged in, execute the view normally. The view code is
@@ -994 +1015 @@
 
     As in the :func:`~decorators.login_required` decorator, ``login_url``
     defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>`.
+    
+    :func:`~decorators.permission_required` decorator, also as in the
+    :func:`~decorators.login_required` decorator, takes an optional parameter
+    ``redirect_field_name``.
 
 Limiting access to generic views
 --------------------------------