Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed #32210 -- Fixed model inlines with to_field that has a default. #16950

Merged
merged 2 commits into from Jul 7, 2023
Merged

Fixed #32210 -- Fixed model inlines with to_field that has a default. #16950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b91d62c
Refs #24377 -- Added assertions for model inlines with primary key th…
sainipray Jul 7, 2023
eed0965
Fixed #32210 -- Fixed model inlines with to_field that has a default.
sainipray Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion django/forms/models.py
View file
Open in desktop
Expand Up @@ -1177,7 +1177,13 @@ def add_fields(self, form, index):
to_field = self.instance._meta.get_field(kwargs["to_field"])
else:
to_field = self.instance._meta.pk
if to_field.has_default():

if to_field.has_default() and (
# Don't ignore a parent's auto-generated key if it's not the
# parent model's pk and form data is provided.
to_field.attname == self.fk.remote_field.model._meta.pk.name
or not form.data
):
setattr(self.instance, to_field.attname, None)

form.fields[name] = InlineForeignKeyField(self.instance, **kwargs)
Expand Down
24 changes: 24 additions & 0 deletions tests/model_formsets/test_uuid.py
View file
Open in desktop
Expand Up @@ -43,6 +43,8 @@ def test_inlineformset_factory_ignores_default_pks_on_submit(self):
}
)
self.assertTrue(formset.is_valid())
self.assertIsNone(formset.instance.uuid)
self.assertIsNone(formset.forms[0].instance.parent_id)

def test_inlineformset_factory_nulls_default_pks_uuid_parent_auto_child(self):
"""
Expand Down Expand Up @@ -91,3 +93,25 @@ def test_inlineformset_factory_nulls_default_pks_alternate_key_relation(self):
)
formset = FormSet()
self.assertIsNone(formset.forms[0].fields["parent"].initial)

def test_inlineformset_factory_nulls_default_pks_alternate_key_relation_data(self):
"""
If form data is provided, a parent's auto-generated alternate key is
set.
"""
FormSet = inlineformset_factory(
ParentWithUUIDAlternateKey, ChildRelatedViaAK, fields="__all__"
)
formset = FormSet(
{
"childrelatedviaak_set-TOTAL_FORMS": 3,
"childrelatedviaak_set-INITIAL_FORMS": 0,
"childrelatedviaak_set-MAX_NUM_FORMS": "",
"childrelatedviaak_set-0-name": "Test",
"childrelatedviaak_set-1-name": "",
"childrelatedviaak_set-2-name": "",
}
)
self.assertIs(formset.is_valid(), True)
self.assertIsNotNone(formset.instance.uuid)
self.assertEqual(formset.forms[0].instance.parent_id, formset.instance.uuid)