diff --git a/django/forms/models.py b/django/forms/models.py index 4ac8a71693..96ac042738 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -603,22 +603,22 @@ class BaseModelFormSet(BaseFormSet): existing_objects[obj.pk] = obj saved_instances = [] for form in self.initial_forms: - pk_name = self._pk_field.name - raw_pk_value = form._raw_value(pk_name) - pk_value = form.fields[pk_name].clean(raw_pk_value) - obj = existing_objects[pk_value] - if self.can_delete: - raw_delete_value = form._raw_value(DELETION_FIELD_NAME) - should_delete = form.fields[DELETION_FIELD_NAME].clean(raw_delete_value) - if should_delete: - self.deleted_objects.append(obj) - obj.delete() - continue - if form.has_changed(): - self.changed_objects.append((obj, form.changed_data)) - saved_instances.append(self.save_existing(form, obj, commit=commit)) - if not commit: - self.saved_forms.append(form) + pk_name = self._pk_field.name + raw_pk_value = form._raw_value(pk_name) + pk_value = form.fields[pk_name].clean(raw_pk_value) + obj = existing_objects[pk_value] + if self.can_delete: + raw_delete_value = form._raw_value(DELETION_FIELD_NAME) + should_delete = form.fields[DELETION_FIELD_NAME].clean(raw_delete_value) + if should_delete: + self.deleted_objects.append(obj) + obj.delete() + continue + if form.has_changed(): + self.changed_objects.append((obj, form.changed_data)) + saved_instances.append(self.save_existing(form, obj, commit=commit)) + if not commit: + self.saved_forms.append(form) return saved_instances def save_new_objects(self, commit=True):