diff options
| -rw-r--r-- | django/forms/formsets.py | 4 | ||||
| -rw-r--r-- | tests/forms_tests/tests/test_formsets.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/django/forms/formsets.py b/django/forms/formsets.py index 235aaf844c..fd4d53a44f 100644 --- a/django/forms/formsets.py +++ b/django/forms/formsets.py @@ -490,7 +490,9 @@ class BaseFormSet(RenderableFormMixin): 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 index e2c695f0dc..ee0ae5a426 100644 --- a/tests/forms_tests/tests/test_formsets.py +++ b/tests/forms_tests/tests/test_formsets.py @@ -1480,6 +1480,7 @@ class FormsFormsetTestCase(SimpleTestCase): 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={ |