Ticket #13539: r16544_13539.diff

django/contrib/admin/util.py

@@ -88 +88 @@
                                 None, (quote(obj._get_pk_val()),))
             p = '%s.%s' % (opts.app_label,
                            opts.get_delete_permission())
-            if not user.has_perm(p):
+            if not user.has_perm(p, obj):
                 perms_needed.add(opts.verbose_name)
             # Display a link to the admin page.
             return mark_safe(u'%s: <a href="%s">%s</a>' %

django/contrib/auth/tests/auth_backends.py

@@ -347 +347 @@
     def test_has_module_perms(self):
         self.assertEqual(self.user1.has_module_perms("app1"), False)
         self.assertEqual(self.user1.has_module_perms("app2"), False)
-

django/contrib/auth/models.py

@@ -153 +153 @@
         if (not active and not anon and backend.supports_inactive_user) or \
                     (not anon or backend.supports_anonymous_user):
             if hasattr(backend, "has_perm"):
-                if obj is not None:
-                    if (backend.supports_object_permissions and
-                        backend.has_perm(user, perm, obj)):
-                            return True
-                else:
-                    if backend.has_perm(user, perm):
-                        return True
+                if obj is not None and backend.supports_object_permissions:
+                    return backend.has_perm(user, perm, obj)
+                return backend.has_perm(user, perm)
     return False