[4.2.x] Fixed #34349 -- Fixed FormSet.empty_form crash when deleting …

…extra forms is disabled. Backport of 6cbc403 from main
django · Feb 20, 2023 · bb94e1b · bb94e1b
1 parent aab25a6
commit bb94e1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/django/forms/formsets.py b/django/forms/formsets.py
@@ -492,7 +492,9 @@ def add_fields(self, form, index):
                     required=False,
                     widget=self.get_ordering_widget(),
                 )
-        if self.can_delete and (self.can_delete_extra or index < initial_form_count):
+        if self.can_delete and (
+            self.can_delete_extra or (index is not None and index < initial_form_count)
+        ):
             form.fields[DELETION_FIELD_NAME] = BooleanField(
                 label=_("Delete"),
                 required=False,

diff --git a/tests/forms_tests/tests/test_formsets.py b/tests/forms_tests/tests/test_formsets.py
@@ -1482,6 +1482,7 @@ def test_disable_delete_extra_formset_forms(self):
         self.assertIn("DELETE", formset.forms[0].fields)
         self.assertNotIn("DELETE", formset.forms[1].fields)
         self.assertNotIn("DELETE", formset.forms[2].fields)
+        self.assertNotIn("DELETE", formset.empty_form.fields)
 
         formset = ChoiceFormFormset(
             data={