mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-09 00:42:40 +00:00
Code Issues 32 Releases Wiki Activity

[5.0.x] Fixed #34982 -- Fixed admin's read-only password widget and help texts alignment for tablet screen size.

Browse Source 
Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>

Backport of 729266c6f29c7a0677b24926a86a767ef3078b26 from main
This commit is contained in:
Tom Carrick 2023-11-23 18:26:01 +01:00 committed by Natalia
parent cbd1e913ef
commit 432bfa2615
5 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/static/admin/css/forms.css
View File

@ -24,7 +24,6 @@ form .form-row p {
.flex-container {
display: flex;
flex-wrap: wrap;
}
.form-multiline > div {
@ -78,6 +77,7 @@ form ul.inline li {
.aligned label {
display: block;
padding: 4px 10px 0 0;
min-width: 160px;
width: 160px;
word-wrap: break-word;
line-height: 1;

1
django/contrib/admin/static/admin/css/responsive.css
View File

@ -588,6 +588,7 @@ input[type="submit"], button {
.aligned label {
width: 100%;
min-width: auto;
padding: 0 0 10px;
}

1
django/contrib/admin/static/admin/css/widgets.css
View File

@ -69,6 +69,7 @@
padding: 0;
overflow: hidden;
line-height: 1;
min-width: auto;
}
.selector .selector-available input,

4
docs/releases/4.2.8.txt
View File

@ -31,3 +31,7 @@ Bugfixes
* Fixed a regression in Django 4.2 that caused a crash of querysets with
aggregations on MariaDB when the ``ONLY_FULL_GROUP_BY`` SQL mode was enabled
(:ticket:`34992`).
* Fixed a regression in Django 4.2 where the admin's read-only password widget
and some help texts were incorrectly aligned at tablet widths
(:ticket:`34982`).

23
tests/admin_views/tests.py
View File

@ -5751,6 +5751,7 @@ class SeleniumTests(AdminSeleniumTestCase):
and with stacked and tabular inlines.
Refs #13068, #9264, #9983, #9784.
"""
from selenium.webdriver import ActionChains
from selenium.webdriver.common.by import By
self.admin_login(
@ -5763,6 +5764,8 @@ class SeleniumTests(AdminSeleniumTestCase):
# Main form ----------------------------------------------------------
self.selenium.find_element(By.ID, "id_pubdate").send_keys("2012-02-18")
status = self.selenium.find_element(By.ID, "id_status")
ActionChains(self.selenium).move_to_element(status).click(status).perform()
self.select_option("#id_status", "option two")
self.selenium.find_element(By.ID, "id_name").send_keys(
" the mAin nÀMë and it's awεšomeıııİ"
@ -5781,6 +5784,10 @@ class SeleniumTests(AdminSeleniumTestCase):
self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-0-pubdate"
).send_keys("2011-12-17")
status = self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-0-status"
)
ActionChains(self.selenium).move_to_element(status).click(status).perform()
self.select_option("#id_relatedprepopulated_set-0-status", "option one")
self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-0-name"
@ -5812,6 +5819,10 @@ class SeleniumTests(AdminSeleniumTestCase):
self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-1-pubdate"
).send_keys("1999-01-25")
status = self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-1-status"
)
ActionChains(self.selenium).move_to_element(status).click(status).perform()
self.select_option("#id_relatedprepopulated_set-1-status", "option two")
self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-1-name"
@ -5835,10 +5846,10 @@ class SeleniumTests(AdminSeleniumTestCase):
# Tabular inlines ----------------------------------------------------
# Initial inline
element = self.selenium.find_element(
status = self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-2-0-status"
)
self.selenium.execute_script("window.scrollTo(0, %s);" % element.location["y"])
ActionChains(self.selenium).move_to_element(status).click(status).perform()
self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-2-0-pubdate"
).send_keys("1234-12-07")
@ -5869,6 +5880,10 @@ class SeleniumTests(AdminSeleniumTestCase):
self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-2-1-pubdate"
).send_keys("1981-08-22")
status = self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-2-1-status"
)
ActionChains(self.selenium).move_to_element(status).click(status).perform()
self.select_option("#id_relatedprepopulated_set-2-1-status", "option one")
self.selenium.find_element(
By.ID, "id_relatedprepopulated_set-2-1-name"
@ -5895,6 +5910,8 @@ class SeleniumTests(AdminSeleniumTestCase):
# Initial inline.
row_id = "id_relatedprepopulated_set-4-0-"
self.selenium.find_element(By.ID, f"{row_id}pubdate").send_keys("2011-12-12")
status = self.selenium.find_element(By.ID, f"{row_id}status")
ActionChains(self.selenium).move_to_element(status).click(status).perform()
self.select_option(f"#{row_id}status", "option one")
self.selenium.find_element(By.ID, f"{row_id}name").send_keys(
" sŤāÇkeð inline ! "
@ -5914,6 +5931,8 @@ class SeleniumTests(AdminSeleniumTestCase):
)[3].click()
row_id = "id_relatedprepopulated_set-4-1-"
self.selenium.find_element(By.ID, f"{row_id}pubdate").send_keys("1999-01-20")
status = self.selenium.find_element(By.ID, f"{row_id}status")
ActionChains(self.selenium).move_to_element(status).click(status).perform()
self.select_option(f"#{row_id}status", "option two")
self.selenium.find_element(By.ID, f"{row_id}name").send_keys(
" now you haVe anöther sŤāÇkeð inline with a very loooong "