p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.8.x] Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False. 

Backport of 36a17be9f3 from master
This commit is contained in:
Tim Graham 2015-03-04 12:00:12 -05:00
parent 4fa61e0e4f
commit 20bf320502
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,7 +203,7 @@ class ChangeList(object):
self.show_full_result_count = self.model_admin.show_full_result_count self.show_full_result_count = self.model_admin.show_full_result_count
# Admin actions are shown if there is at least one entry # Admin actions are shown if there is at least one entry
# or if entries are not counted because show_full_result_count is disabled # 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.full_result_count = full_result_count
self.result_list = result_list self.result_list = result_list
self.can_show_all = can_show_all self.can_show_all = can_show_all

1
tests/admin_views/tests.py
View File

@ -2655,6 +2655,7 @@ class AdminSearchTest(TestCase):
self.assertContains(response, self.assertContains(response,
"""<span class="small quiet">1 result (<a href="?">Show all</a>)</span>""", """<span class="small quiet">1 result (<a href="?">Show all</a>)</span>""",
html=True) html=True)
self.assertTrue(response.context['cl'].show_admin_actions)
@override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',), @override_settings(PASSWORD_HASHERS=('django.contrib.auth.hashers.SHA1PasswordHasher',),