From 614d881450983fa3678761f68aaf188c38a5a228 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Fri, 8 May 2009 09:59:46 +0000 Subject: [PATCH] Fixed #10750: respect comment=False in inline formsets. Thanks, Koen Biermans. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10706 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/forms/models.py | 3 ++- .../regressiontests/inline_formsets/tests.py | 27 ++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/django/forms/models.py b/django/forms/models.py index 96ce06519f..3648a45b65 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -734,7 +734,8 @@ class BaseInlineFormSet(BaseModelFormSet): # save the object. obj = form.save(commit=False) setattr(obj, self.fk.get_attname(), self.instance.pk) - obj.save() + 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() diff --git a/tests/regressiontests/inline_formsets/tests.py b/tests/regressiontests/inline_formsets/tests.py index 1d9a730479..aef6b3f10a 100644 --- a/tests/regressiontests/inline_formsets/tests.py +++ b/tests/regressiontests/inline_formsets/tests.py @@ -1,6 +1,6 @@ from django.test import TestCase from django.forms.models import inlineformset_factory -from regressiontests.inline_formsets.models import Poet, Poem +from regressiontests.inline_formsets.models import Poet, Poem, School, Parent, Child class DeletionTests(TestCase): def test_deletion(self): @@ -74,3 +74,28 @@ class DeletionTests(TestCase): self.assertEqual(formset.is_valid(), True) formset.save() self.assertEqual(Poem.objects.count(), 0) + + def test_save_new(self): + """ + Make sure inlineformsets respect commit=False + regression for #10750 + """ + # exclude some required field from the forms + ChildFormSet = inlineformset_factory(School, Child, exclude=['father', 'mother']) + school = School.objects.create(name=u'test') + mother = Parent.objects.create(name=u'mother') + father = Parent.objects.create(name=u'father') + data = { + 'child_set-TOTAL_FORMS': u'1', + 'child_set-INITIAL_FORMS': u'0', + 'child_set-0-name': u'child', + } + formset = ChildFormSet(data, instance=school) + self.assertEqual(formset.is_valid(), True) + objects = formset.save(commit=False) + for obj in objects: + obj.mother = mother + obj.father = father + obj.save() + self.assertEqual(school.child_set.count(), 1) +