Context Navigation

Ticket #10711: 10711-2.diff

File 10711-2.diff, 1.6 KB (added by Claude Paroz, 12 years ago)
Use cleaned_data in _should_delete_form

diff --git a/django/forms/formsets.py b/django/forms/formsets.py
index 1ec8340..d652130 100644

                class BaseFormSet(StrAndUnicode):
     errors = property(_get_errors)
     def _should_delete_form(self, form):
+        # The way we lookup the value of the deletion field here takes
+        # more code than we'd like, but the form's cleaned_data will
+        # not exist if the form is invalid.
+        field = form.fields[DELETION_FIELD_NAME]
+        raw_value = form._raw_value(DELETION_FIELD_NAME)
+        should_delete = field.clean(raw_value)
+        return should_delete
+        return form.cleaned_data.get(DELETION_FIELD_NAME, False)
     def is_valid(self):
         """

diff --git a/django/forms/models.py b/django/forms/models.py
index e6ae357..553f174 100644

                class BaseModelFormSet(BaseFormSet):
             return []
         saved_instances = []
+        try:
+            forms_to_delete = self.deleted_forms
+        except AttributeError:
+            forms_to_delete = []
         for form in self.initial_forms:
             pk_name = self._pk_field.name
             raw_pk_value = form._raw_value(pk_name)
-…
+               class BaseModelFormSet(BaseFormSet):
             pk_value = getattr(pk_value, 'pk', pk_value)
             obj = self._existing_object(pk_value)
             if self.can_delete and self._should_delete_form(form):
+            if form in forms_to_delete:
                 self.deleted_objects.append(obj)
                 obj.delete()
                 continue