Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #14795 -- Ensure that get_all_permissions() returns the right r…

…esult (i.e., all permissions) for superusers. Thanks to jay.halleaux@gmail.com for the report, and Brett Haydon for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 5b8ef18dcc006c0fa53b356efbb7cf2c691463d5 1 parent 52c7780
Russell Keith-Magee authored December 04, 2010
8  django/contrib/auth/backends.py
@@ -25,9 +25,11 @@ def get_group_permissions(self, user_obj):
25 25
         groups.
26 26
         """
27 27
         if not hasattr(user_obj, '_group_perm_cache'):
28  
-            perms = Permission.objects.filter(group__user=user_obj
29  
-                ).values_list('content_type__app_label', 'codename'
30  
-                ).order_by()
  28
+            if user_obj.is_superuser:
  29
+                perms = Permission.objects.all()
  30
+            else:
  31
+                perms = Permission.objects.filter(group__user=user_obj)
  32
+            perms = perms.values_list('content_type__app_label', 'codename').order_by()
31 33
             user_obj._group_perm_cache = set(["%s.%s" % (ct, name) for ct, name in perms])
32 34
         return user_obj._group_perm_cache
33 35
 
5  django/contrib/auth/tests/auth_backends.py
@@ -15,6 +15,7 @@ def setUp(self):
15 15
         self.curr_auth = settings.AUTHENTICATION_BACKENDS
16 16
         settings.AUTHENTICATION_BACKENDS = (self.backend,)
17 17
         User.objects.create_user('test', 'test@example.com', 'test')
  18
+        User.objects.create_superuser('test2', 'test2@example.com', 'test')
18 19
 
19 20
     def tearDown(self):
20 21
         settings.AUTHENTICATION_BACKENDS = self.curr_auth
@@ -90,6 +91,10 @@ def test_has_no_object_perm(self):
90 91
         self.assertEqual(user.has_perm('auth.test'), True)
91 92
         self.assertEqual(user.get_all_permissions(), set(['auth.test']))
92 93
 
  94
+    def test_get_all_superuser_permissions(self):
  95
+        "A superuser has all permissions. Refs #14795"
  96
+        user = User.objects.get(username='test2')
  97
+        self.assertEqual(len(user.get_all_permissions()), len(Permission.objects.all()))
93 98
 
94 99
 class TestObj(object):
95 100
     pass

0 notes on commit 5b8ef18

Please sign in to comment.
Something went wrong with that request. Please try again.