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 #33024 -- Fixed height of admin selector boxes in collapsed fieldset.

Browse Source 
Thanks Tom Carrick for the review.
This commit is contained in:
Shubh1815
2021-11-15 19:57:11 +05:30
committed by Mariusz Felisiak
parent b8c0b22f2f
commit 51c24d8799
5 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/admin_views/admin.py
View File

@@ -1164,6 +1164,25 @@ site7 = admin.AdminSite(name="admin7")
site7.register(Article, ArticleAdmin2)
site7.register(Section)
site7.register(PrePopulatedPost, PrePopulatedPostReadOnlyAdmin)
site7.register(
Pizza,
filter_horizontal=['toppings'],
fieldsets=(
('Collapsible', {
'classes': ['collapse'],
'fields': ['toppings'],
}),
),
)
site7.register(
Question,
filter_horizontal=['related_questions'],
fieldsets=(
('Not collapsible', {
'fields': ['related_questions'],
}),
),
)
# Used to test ModelAdmin.sortable_by and get_sortable_by().

43
tests/admin_views/tests.py
View File

@@ -4810,6 +4810,49 @@ class SeleniumTests(AdminSeleniumTestCase):
self.assertTrue(self.selenium.find_element(By.ID, 'id_title').is_displayed())
self.assertEqual(self.selenium.find_element(By.ID, 'fieldsetcollapser0').text, "Hide")
def test_selectbox_height_collapsible_fieldset(self):
from selenium.webdriver.common.by import By
self.admin_login(
username='super',
password='secret',
login_url=reverse('admin7:index'),
)
url = self.live_server_url + reverse('admin7:admin_views_pizza_add')
self.selenium.get(url)
self.selenium.find_elements(By.LINK_TEXT, 'Show')[0].click()
filter_box = self.selenium.find_element(By.ID, 'id_toppings_filter')
from_box = self.selenium.find_element(By.ID, 'id_toppings_from')
to_box = self.selenium.find_element(By.ID, 'id_toppings_to')
self.assertEqual(
to_box.get_property('offsetHeight'),
(
filter_box.get_property('offsetHeight') +
from_box.get_property('offsetHeight')
),
)
def test_selectbox_height_not_collapsible_fieldset(self):
from selenium.webdriver.common.by import By
self.admin_login(
username='super',
password='secret',
login_url=reverse('admin7:index'),
)
url = self.live_server_url + reverse('admin7:admin_views_question_add')
self.selenium.get(url)
filter_box = self.selenium.find_element(By.ID, 'id_related_questions_filter')
from_box = self.selenium.find_element(By.ID, 'id_related_questions_from')
to_box = self.selenium.find_element(By.ID, 'id_related_questions_to')
self.assertEqual(
to_box.get_property('offsetHeight'),
(
filter_box.get_property('offsetHeight') +
from_box.get_property('offsetHeight')
),
)
def test_first_field_focus(self):
"""JavaScript-assisted auto-focus on first usable form field."""
from selenium.webdriver.common.by import By