Ticket #12441: 12441.diff

django/contrib/admin/sites.py

@@ -141 +141 @@
         """
         return request.user.is_authenticated() and request.user.is_staff
 
+    def has_module_perms(self, request, app_label):
+        """
+        Returns True if the given HttpRequest has permission to view
+        given application admin site.
+        """
+        return request.user.has_module_perms(app_label)
+
     def check_dependencies(self):
         """
         Check that all things needed to run the admin have been correctly installed.
@@ -336 +343 @@
         apps that have been registered in this site.
         """
         app_dict = {}
-        user = request.user
         for model, model_admin in self._registry.items():
             app_label = model._meta.app_label
-            has_module_perms = user.has_module_perms(app_label)
+            has_module_perms = self.has_module_perms(request, app_label)
 
             if has_module_perms:
                 perms = model_admin.get_model_perms(request)
@@ -397 +403 @@
         )
 
     def app_index(self, request, app_label, extra_context=None):
-        user = request.user
-        has_module_perms = user.has_module_perms(app_label)
+        has_module_perms = self.has_module_perms(request, app_label)
         app_dict = {}
-        for model, model_admin in self._registry.items():
-            if app_label == model._meta.app_label:
-                if has_module_perms:
+        if has_module_perms:
+            for model, model_admin in self._registry.items():
+                if app_label == model._meta.app_label:
                     perms = model_admin.get_model_perms(request)
 
                     # Check whether user has any perm for this module.