Ticket #16797: active_login_required_path.diff

decorators.py

@@ +1 @@
+"""Handy decorators, to decorate your views."""
+
 import urlparse
 from functools import wraps
 from django.conf import settings
@@ -48 +50 @@
     return actual_decorator
 
 
+def active_login_required(function=None, redirect_field_name=REDIRECT_FIELD_NAME, login_url=None):
+    """
+    Decorator for views that checks that the user is logged in and still active, redirecting
+    to the log-in page if necessary.
+    """
+    actual_decorator = user_passes_test(
+        lambda u: u.is_authenticated() and getattr(u, 'is_active', True),
+        login_url=login_url,
+        redirect_field_name=redirect_field_name
+    )
+    if function:
+        return actual_decorator(function)
+    return actual_decorator
+
+
 def permission_required(perm, login_url=None, raise_exception=False):
     """
     Decorator for views that checks whether a user has a particular permission
@@ -56 +73 @@
     is raised.
     """
     def check_perms(user):
-        # First check if the user has the permission (even anon users)
+        """
+        First check if the user has the permission (even anon users)
+        In case the 403 handler should be called raise the exception
+        As the last resort, show the login form
+        """
         if user.has_perm(perm):
             return True
-        # In case the 403 handler should be called raise the exception
         if raise_exception:
             raise PermissionDenied
-        # As the last resort, show the login form
         return False
     return user_passes_test(check_perms, login_url=login_url)