diff options
| author | Johannes Maron <johannes@maron.family> | 2025-12-27 12:28:26 +0100 |
|---|---|---|
| committer | Jacob Walls <jacobtylerwalls@gmail.com> | 2025-12-31 10:18:06 -0500 |
| commit | b7b5465b1c026dda7de646fca15ca1e97886d021 (patch) | |
| tree | e1c0da5fd91ee9921b0488790021e071b2d40408 /django | |
| parent | 90daa655486c7fc69e9dad41c5e96f00339a3b9b (diff) | |
[6.0.x] Fixed #36829 -- Reverted value of ClearableFileInput.use_fieldset to True.
There was unresolved discussion regarding whether to set
ClearableFileInput.use_fieldset to True or False when use_fieldset was
introduced in Django 4.1, since the clear checkbox appears only
sometimes. Although using <fieldset> is likely desirable, since the
primary motivation in #35892 was just to improve markup in the admin,
and a deprecation path was not provided for general form usage, future
work is deferred to #36828.
Regression in 4187da258fe212d494cb578a0bc2b52c4979ab95.
Thanks Tim Graham, Antoliny, and David Smith for triage.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/widgets.py | 1 | ||||
| -rw-r--r-- | django/forms/widgets.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py index 81b57f33aa..f5c3939012 100644 --- a/django/contrib/admin/widgets.py +++ b/django/contrib/admin/widgets.py @@ -122,6 +122,7 @@ class AdminRadioSelect(forms.RadioSelect): class AdminFileWidget(forms.ClearableFileInput): template_name = "admin/widgets/clearable_file_input.html" + use_fieldset = True def url_params_from_lookup_dict(lookups): diff --git a/django/forms/widgets.py b/django/forms/widgets.py index b77e57abce..1bcfeba288 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -530,7 +530,7 @@ class ClearableFileInput(FileInput): input_text = _("Change") template_name = "django/forms/widgets/clearable_file_input.html" checked = False - use_fieldset = True + use_fieldset = False def clear_checkbox_name(self, name): """ |