summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-08 04:22:00 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-02-08 04:22:00 +0000
commit55cd02567099767ff9e48a8be24157db6a934ba0 (patch)
tree283b6097ec16a3c7952d9a87916ddd64229fcebf
parent755bb2a3f2c7e59f2b7cb7daacb65acad79c7e19 (diff)
queryset-refactor: Fixed a place where admin was poking about under the covers and I had moved the internal feature it was relying on.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/views/main.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index c45d7e640e..1e66b56e0f 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -627,7 +627,7 @@ class ChangeList(object):
# 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 isinstance(self.query_set._filters, models.Q) and not self.query_set._filters.kwargs:
+ if not self.query_set.query.where:
full_result_count = result_count
else:
full_result_count = self.manager.count()