Ticket #6056: contrib_auth_decorators.py.2.diff

django/contrib/auth/decorators.py

@@ -32 +32 @@
     """
     return user_passes_test(lambda u: u.has_perm(perm), login_url=login_url)
 
+def permission_required_or_message(perm):
+    """
+    Decorator for views that checks whether a user has a particular permission
+    enabled, if user is authenticated, show message and redirect to refer, 
+    else, redirecting to the log-in page.
+    """
+    def decorate(view_func):
+        return _CheckLoginOrMessage(view_func, lambda u: u.has_perm(perm))
+    return decorate
+
 class _CheckLogin(object):
     """
     Class that checks that the user passes the given test, redirecting to
@@ -60 +70 @@
     def __call__(self, request, *args, **kwargs):
         if self.test_func(request.user):
             return self.view_func(request, *args, **kwargs)
+        return self.redirect_to_login(request)
+
+    def redirect_to_login(self, request):
         path = urlquote(request.get_full_path())
         tup = self.login_url, self.redirect_field_name, path
         return HttpResponseRedirect('%s?%s=%s' % tup)
+
+class _CheckLoginOrMessage(_CheckLogin):
+    """
+    If user is authenticated, show message and redirect to refer.
+    """
+    def __call__(self, request, *args, **kwargs):
+        if self.test_func(request.user):
+            return self.view_func(request, *args, **kwargs)
+        refer = request.META.get('HTTP_REFERER')
+        if not refer or not request.user.is_authenticated():
+            return self.redirect_to_login(request)
+        request.user.message_set.create(
+            message=_("%s has no %s permission" % (
+                request.user.username, self.__name__)))
+        return HttpResponseRedirect(refer)
+