Ticket #11295: admin-count.diff

django/contrib/admin/views/main.py

@@ -104 +104 @@
 
         # Get the total number of objects, with no admin filters applied.
         # Perform a slight optimization: Check to see whether any filters were
-        # given. If not, use paginator.hits to calculate the number of objects,
-        # because we've already done paginator.hits and the value is cached.
-        if not self.query_set.query.where:
+        # given by the user, if any came from ModelAdmin.queryset we don't
+        # consider those here. If not, use paginator.hits to calculate the
+        # number of objects, because we've already done paginator.hits and the
+        # value is cached.
+        if not set(self.params) - set([ALL_VAR, ORDER_VAR, ORDER_TYPE_VAR, SEARCH_VAR, IS_POPUP_VAR]):
             full_result_count = result_count
         else:
             full_result_count = self.root_query_set.count()