diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-12-07 14:11:27 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-12-11 15:32:10 +0100 |
| commit | d32637d81b6b4adf6440bead756fb5a063e4d28d (patch) | |
| tree | 9f1e362f53dae274d04a548110079bfd512d4d0b /django | |
| parent | 64483b483151fb0dce02ad423e48fa7645dada1b (diff) | |
[1.6.x] Fixed #21510 -- Readded search reset link in changelist search bar
Thanks moritz.pfeiffer at alp-phone.ch for the report and
Tim Graham for the initial patch.
Backport of c7c647419c from master.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/views/main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 56462dece8..e7b23913e9 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -223,7 +223,7 @@ class ChangeList(six.with_metaclass(RenameChangeListMethods)): # Perform a slight optimization: # full_result_count is equal to paginator.count if no filters # were applied - if self.get_filters_params(): + if self.get_filters_params() or self.params.get(SEARCH_VAR): full_result_count = self.root_queryset.count() else: full_result_count = result_count |