summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Johnson <me@adamj.eu>2024-04-18 12:52:53 +0100
committerSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2024-04-19 11:20:01 +0200
commitbdd76c4c3817d8e3ed5b0450d5e18e4eae096f16 (patch)
tree9cd17a80120a38a35ffaba7e8a7a05fe070592d9
parent2be37b253341cfd1f1363c533e6f896230f047a7 (diff)
Fixed #34994, Fixed #35386 -- Applied checkbox-row CSS class unconditionally in Admin.
-rw-r--r--django/contrib/admin/templates/admin/includes/fieldset.html2
-rw-r--r--docs/releases/4.2.12.txt4
-rw-r--r--docs/releases/5.0.5.txt4
3 files changed, 9 insertions, 1 deletions
diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html
index 9a4372f791..04e76055ce 100644
--- a/django/contrib/admin/templates/admin/includes/fieldset.html
+++ b/django/contrib/admin/templates/admin/includes/fieldset.html
@@ -9,7 +9,7 @@
{% for field in line %}
<div>
{% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
- <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
+ <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% endif %}{% if field.is_checkbox %} checkbox-row{% endif %}">
{% if field.is_checkbox %}
{{ field.field }}{{ field.label_tag }}
{% else %}
diff --git a/docs/releases/4.2.12.txt b/docs/releases/4.2.12.txt
index 64a6832d59..7423dd8745 100644
--- a/docs/releases/4.2.12.txt
+++ b/docs/releases/4.2.12.txt
@@ -12,3 +12,7 @@ Bugfixes
* Fixed a crash in Django 4.2 when validating email max line lengths with
content decoded using the ``surrogateescape`` error handling scheme
(:ticket:`35361`).
+
+* Fixed a regression in Django 4.2 where multiple checkboxes in the admin would
+ be centered on narrower screen widths (:ticket:`34994`) or have misaligned
+ labels (:ticket:`35386`).
diff --git a/docs/releases/5.0.5.txt b/docs/releases/5.0.5.txt
index 788753c826..e343d730b0 100644
--- a/docs/releases/5.0.5.txt
+++ b/docs/releases/5.0.5.txt
@@ -20,3 +20,7 @@ Bugfixes
* Fixed a bug in Django 5.0 that caused a crash when applying migrations
including alterations to ``GeneratedField`` such as setting ``db_index=True``
on SQLite (:ticket:`35373`).
+
+* Fixed a regression in Django 4.2 where multiple checkboxes in the admin would
+ be centered on narrower screen widths (:ticket:`34994`) or have misaligned
+ labels (:ticket:`35386`).