mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #22810 -- Corrected admin changelist count for list filters that filter by default.

Browse Source
This commit is contained in:
Nick Sandford
2015-11-07 13:01:25 +00:00
committed by Tim Graham
parent ad167502f3
commit 5fa7b592b3
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/admin/views/main.py
View File

@@ -174,14 +174,8 @@ class ChangeList(object):
result_count = paginator.count
# Get the total number of objects, with no admin filters applied.
# Perform a slight optimization:
# full_result_count is equal to paginator.count if no filters
# were applied
if self.model_admin.show_full_result_count:
if self.get_filters_params() or self.params.get(SEARCH_VAR):
full_result_count = self.root_queryset.count()
else:
full_result_count = result_count
full_result_count = self.root_queryset.count()
else:
full_result_count = None
can_show_all = result_count <= self.list_max_show_all