innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #25097 -- Added BaseModelFormSet.delete_existing() hook.

This commit is contained in:
Simon Litchfield 2015-07-10 15:29:09 +10:00 committed by Tim Graham
parent 561c018d88
commit 0ffa3943fb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/forms/models.py
View File

@ -632,6 +632,11 @@ class BaseModelFormSet(BaseFormSet):
"""Saves and returns an existing model instance for the given form.""" """Saves and returns an existing model instance for the given form."""
return form.save(commit=commit) return form.save(commit=commit)
def delete_existing(self, obj, commit=True):
"""Deletes an existing model instance."""
if commit:
obj.delete()
def save(self, commit=True): def save(self, commit=True):
"""Saves model instances for every form, adding and changing instances """Saves model instances for every form, adding and changing instances
as necessary, and returns the list of instances. as necessary, and returns the list of instances.
@ -756,8 +761,7 @@ class BaseModelFormSet(BaseFormSet):
if obj.pk is None: if obj.pk is None:
continue continue
self.deleted_objects.append(obj) self.deleted_objects.append(obj)
if commit: self.delete_existing(obj, commit=commit)
obj.delete()
elif form.has_changed(): elif form.has_changed():
self.changed_objects.append((obj, form.changed_data)) self.changed_objects.append((obj, form.changed_data))
saved_instances.append(self.save_existing(form, obj, commit=commit)) saved_instances.append(self.save_existing(form, obj, commit=commit))