Ticket #7510: admin-qs.diff

a/django/contrib/admin/options.py

@@ -523 +523 @@
-        app_label = opts.app_label
-
-        try:
-model._default_manager
+self.queryset(request)
-        except model.DoesNotExist:
-            # Don't raise Http404 just yet, because we haven't checked
-            # permissions yet. We don't want an unauthenticated user to be able
@@ -621 +621 @@
-        app_label = opts.app_label
-
-        try:
-model._default_manager
+queryset(request)
-        except self.model.DoesNotExist:
-            # Don't raise Http404 just yet, because we haven't checked
-            # permissions yet. We don't want an unauthenticated user to be able

a/tests/regressiontests/admin_views/models.py

@@ -32 +32 @@
-    content = models.TextField()
-    date = models.DateTimeField()
-
+class EmptyModel(models.Model):
+    def __unicode__(self):
+        return "Primary key = %s" % self.id
+
+class EmptyModelAdmin(admin.ModelAdmin):
+    def queryset(self, request):
+        return super(EmptyModelAdmin, self).queryset(request).filter(pk__gt=1)
+
-class CustomArticleAdmin(admin.ModelAdmin):
-    """
-    Tests various hooks for using custom templates and contexts.
@@ -58 +66 @@
-admin.site.register(Article, ArticleAdmin)
-admin.site.register(CustomArticle, CustomArticleAdmin)
-admin.site.register(Section)
+admin.site.register(EmptyModel, EmptyModelAdmin)
-admin.site.register(ModelWithStringPrimaryKey)

a/tests/regressiontests/admin_views/tests.py

@@ -8 +8 @@
-from django.utils.html import escape
-
-# local test models
-
+EmptyModel, 
-
-def get_perm(Model, perm):
-    """Return the permission object, for the Model"""
@@ -360 +360 @@
-        response = self.client.get('/test_admin/admin/admin_views/modelwithstringprimarykey/%s/delete/' % quote(self.pk))
-        should_contain = """<a href="../../%s/">%s</a>""" % (quote(self.pk), escape(self.pk))
-        self.assertContains(response, should_contain)
+
+class AdminCustomQuerytetTest(TestCase):
+    fixtures = ['admin-views-users.xml']
+    
+    def setUp(self):
+        self.client.login(username='super', password='secret')
+        self.pks = []
+        self.pks.append(EmptyModel.objects.create().id)
+        self.pks.append(EmptyModel.objects.create().id)
+        self.pks.append(EmptyModel.objects.create().id)
+    
+    def test_changelist_view(self):
+        response = self.client.get('/test_admin/admin/admin_views/emptymodel/')
+        for i in self.pks:
+            if i > 1:
+                self.assertContains(response, 'Primary key = %s' % i)
+            else:
+                self.assertNotContains(response, 'Primary key = %s' % i)
+    
+    def test_change_view(self):
+        for i in self.pks:
+            response = self.client.get('/test_admin/admin/admin_views/emptymodel/%s/' % i)
+            if i > 1:
+                self.assertEqual(response.status_code, 200)
+            else:
+                self.assertEqual(response.status_code, 404)
+                
+                
+