diff options
| author | Tim Graham <timograham@gmail.com> | 2015-03-04 12:00:12 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-03-04 12:00:12 -0500 |
| commit | 36a17be9f3cf6081f7e6f83fcfeae3d09ce8a72b (patch) | |
| tree | 99f53cbc9700b417374e0a61c1f694f10e1e3d1b | |
| parent | fe42bfaaff93e6b4af34ab48892e20c9cdee0c1a (diff) | |
Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False.
| -rw-r--r-- | django/contrib/admin/views/main.py | 2 | ||||
| -rw-r--r-- | tests/admin_views/tests.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index fa91ceae3a..c0e59f9a5f 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -203,7 +203,7 @@ class ChangeList(object): self.show_full_result_count = self.model_admin.show_full_result_count # Admin actions are shown if there is at least one entry # or if entries are not counted because show_full_result_count is disabled - self.show_admin_actions = self.show_full_result_count or bool(full_result_count) + self.show_admin_actions = not self.show_full_result_count or bool(full_result_count) self.full_result_count = full_result_count self.result_list = result_list self.can_show_all = can_show_all diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 5ec7bc0de2..11cc9e5f39 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -2657,6 +2657,7 @@ class AdminSearchTest(TestCase): self.assertContains(response, """<span class="small quiet">1 result (<a href="?">Show all</a>)</span>""", html=True) + self.assertTrue(response.context['cl'].show_admin_actions) @override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'], |