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

Fixed #11872 -- Instantiate the correct model in BaseInlineFormSet.__init__ when instance is None. Thanks tobias. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner 2009-10-30 09:11:56 +00:00
parent 8812060d77
commit 8dd4a28721
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/forms/models.py
View File

@ -705,7 +705,7 @@ class BaseInlineFormSet(BaseModelFormSet):
save_as_new=False, prefix=None): save_as_new=False, prefix=None):
from django.db.models.fields.related import RelatedObject from django.db.models.fields.related import RelatedObject
if instance is None: if instance is None:
self.instance = self.model() self.instance = self.fk.rel.to()
else: else:
self.instance = instance self.instance = instance
self.save_as_new = save_as_new self.save_as_new = save_as_new

10
tests/regressiontests/model_formsets_regress/tests.py
View File

@ -140,3 +140,13 @@ class InlineFormsetTests(TestCase):
self.assertEqual(manager[1]['name'], 'Terry Gilliam') self.assertEqual(manager[1]['name'], 'Terry Gilliam')
else: else:
self.fail('Errors found on formset:%s' % form_set.errors) self.fail('Errors found on formset:%s' % form_set.errors)
def test_formset_with_none_instance(self):
"A formset with instance=None can be created. Regression for #11872"
Form = modelform_factory(User)
FormSet = inlineformset_factory(User, UserSite)
# Instantiate the Form and FormSet to prove
# you can create a formset with an instance of None
form = Form(instance=None)
formset = FormSet(instance=None)