p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #29474 -- Simplified BaseInlineFormset.save_new().

This commit is contained in:
Tim Graham 2018-06-07 21:14:19 -04:00
parent 6df3d36801
commit 236bcfea42
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/forms/models.py
View File

@ -940,17 +940,7 @@ class BaseInlineFormSet(BaseModelFormSet):
# form (it may have been saved after the formset was originally # form (it may have been saved after the formset was originally
# instantiated). # instantiated).
setattr(form.instance, self.fk.name, self.instance) setattr(form.instance, self.fk.name, self.instance)
# Use commit=False so we can assign the parent key afterwards, then return super().save_new(form, commit=commit)
# save the object.
obj = form.save(commit=False)
pk_value = getattr(self.instance, self.fk.remote_field.field_name)
setattr(obj, self.fk.get_attname(), getattr(pk_value, 'pk', pk_value))
if commit:
obj.save()
# form.save_m2m() can be called via the formset later on if commit=False
if commit and hasattr(form, 'save_m2m'):
form.save_m2m()
return obj
def add_fields(self, form, index): def add_fields(self, form, index):
super().add_fields(form, index) super().add_fields(form, index)