Incorrect checkbox help text alignment in multi-field rows

[Adam Johnson]

For a single checkbox, styles align the help under the checkbox:

When the checkbox appears with any other field in the same line, this is undone:

Example admin:

from django.contrib import admin
from example.models import Switcher


class SwitcherAdmin(admin.ModelAdmin):
    fieldsets = [
        (
            None,
            {
                "fields": [
                    ("up", "down"),
                ],
            },
        ),
    ]


admin.site.register(Switcher, SwitcherAdmin)

(It doesn’t matter if the other field is a checkbox or not.)

Changing fieldset.html so checkbox-row is applied unconditionally to checkbox-containing field boxes fixes this regression, plus #34994:

[Adam Johnson]

single-correct

[Adam Johnson]

double-incorrect

[Adam Johnson]

fixed

[Adam Johnson]

previous-dense

[Adam Johnson]

I ran a bisect and confirmed this was a regression in 96a598356a9ea8c2c05b22cadc12e256a3b295fd, before which checkboxes would be densely packed:

[Natalia Bidart]

Thank you Adam, great catch!

[Sarah Boyce]

(need to confirm if this needs backporting, if so I think this will need a release note for 4.2 and 5.0)

[Sarah Boyce <42296566+sarahboyce@…>]

In bdd76c4:

Fixed #34994, Fixed #35386 -- Applied checkbox-row CSS class unconditionally in Admin.

[Sarah Boyce <42296566+sarahboyce@…>]

In ffcf6607:

[5.0.x] Fixed #34994, Fixed #35386 -- Applied checkbox-row CSS class unconditionally in Admin.

Backport of bdd76c4c3817d8e3ed5b0450d5e18e4eae096f16 from main.

[Sarah Boyce <42296566+sarahboyce@…>]

In 0fc8326:

[4.2.x] Fixed #34994, Fixed #35386 -- Applied checkbox-row CSS class unconditionally in Admin.

Backport of bdd76c4c3817d8e3ed5b0450d5e18e4eae096f16 from main.

[Sarah Boyce <42296566+sarahboyce@…>]

In 256f719:

[4.2.x] Reverted "Fixed #34994, Fixed #35386 -- Applied checkbox-row CSS class unconditionally in Admin."

This reverts commit 0fc832676cd585fa420d583937b5b2318bc2c629.

[Sarah Boyce <42296566+sarahboyce@…>]

In a42a2fa:

[5.0.x] Reverted "Fixed #34994, Fixed #35386 -- Applied checkbox-row CSS class unconditionally in Admin."

This reverts commit ffcf66071158ed3b5541ed13b4c7381240d1b310.

[Richard Laager]

I noticed this was reverted in the stable branches? Was there some technical issue with the fix, or was this a policy issue (i.e. it should not have been backported to those releases per policy)?

[Natalia Bidart]

Replying to Richard Laager:

I noticed this was reverted in the stable branches? Was there some technical issue with the fix, or was this a policy issue (i.e. it should not have been backported to those releases per policy)?

That's right Richard, this should not have been backported per policy. Details of that conversation are in ​these comments.