Added use_fieldset to the ClearableFileInput widget.

Antoliny0919 · Antoliny0919 · commit 93a290f5fdf8 · 2025-07-30T21:09:31.000+09:00
diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css
@@ -42,6 +42,7 @@ label {
     font-size: 0.8125rem;
 }
 
+.required legend, legend.required,
 .required label, label.required {
     font-weight: bold;
 }
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
@@ -530,6 +530,7 @@ class ClearableFileInput(FileInput):
     input_text = _("Change")
     template_name = "django/forms/widgets/clearable_file_input.html"
     checked = False
+    use_fieldset = True
 
     def clear_checkbox_name(self, name):
         """
diff --git a/tests/admin_views/models.py b/tests/admin_views/models.py
@@ -636,6 +636,7 @@ class Course(models.Model):
     ]
 
     title = models.CharField(max_length=100)
+    materials = models.FileField(upload_to="test_upload")
     difficulty = models.CharField(
         max_length=20, choices=DIFFICULTY_CHOICES, null=True, blank=True
     )
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
@@ -70,6 +70,7 @@
     Color,
     ComplexSortedPerson,
     Country,
+    Course,
     CoverLetter,
     CustomArticle,
     CyclicOne,
@@ -6914,9 +6915,16 @@ def test_use_fieldset_fields_render(self):
         self.admin_login(
             username="super", password="secret", login_url=reverse("admin:index")
         )
-
-        expected_legend_tags_text = ["Difficulty:", "Students:", "Start datetime:"]
-        url = reverse("admin:admin_views_course_add")
+        course = Course.objects.create(
+            title="Django Class", materials="django_documents"
+        )
+        expected_legend_tags_text = [
+            "Materials:",
+            "Difficulty:",
+            "Students:",
+            "Start datetime:",
+        ]
+        url = reverse("admin:admin_views_course_change", args=(course.pk,))
         self.selenium.get(self.live_server_url + url)
         fieldsets = self.selenium.find_elements(
             By.CSS_SELECTOR, "fieldset.aligned fieldset"
diff --git a/tests/forms_tests/widget_tests/test_clearablefileinput.py b/tests/forms_tests/widget_tests/test_clearablefileinput.py
@@ -246,18 +246,19 @@ class TestForm(Form):
             )
 
         form = TestForm()
-        self.assertIs(self.widget.use_fieldset, False)
+        self.assertIs(self.widget.use_fieldset, True)
         self.assertHTMLEqual(
-            '<div><label for="id_field">Field:</label>'
-            '<input id="id_field" name="field" type="file" required></div>'
-            '<div><label for="id_with_file">With file:</label>Currently: '
+            '<div><fieldset><legend for="id_field">Field:</legend>'
+            '<input id="id_field" name="field" type="file" required></fieldset></div>'
+            '<div><fieldset><legend for="id_with_file">With file:</legend>Currently: '
             '<a href="something">something</a><br>Change:<input type="file" '
-            'name="with_file" id="id_with_file"></div>'
-            '<div><label for="id_clearable_file">Clearable file:</label>'
+            'name="with_file" id="id_with_file"></fieldset></div>'
+            '<div><fieldset><legend for="id_clearable_file">Clearable file:</legend>'
             'Currently: <a href="something">something</a><input '
             'type="checkbox" name="clearable_file-clear" id="clearable_file-clear_id">'
             '<label for="clearable_file-clear_id">Clear</label><br>Change:'
-            '<input type="file" name="clearable_file" id="id_clearable_file"></div>',
+            '<input type="file" name="clearable_file" id="id_clearable_file">'
+            "</fieldset></div>",
             form.render(),
         )
 

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ label {`
`42`	`42`	`font-size: 0.8125rem;`
`43`	`43`	`}`
`44`	`44`
	`45`	`+.required legend, legend.required,`
`45`	`46`	`.required label, label.required {`
`46`	`47`	`font-weight: bold;`
`47`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -636,6 +636,7 @@ class Course(models.Model):`
`636`	`636`	`]`
`637`	`637`
`638`	`638`	`title = models.CharField(max_length=100)`
	`639`	`+ materials = models.FileField(upload_to="test_upload")`
`639`	`640`	`difficulty = models.CharField(`
`640`	`641`	`max_length=20, choices=DIFFICULTY_CHOICES, null=True, blank=True`
`641`	`642`	`)`