mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 14:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #7918 -- Allow the foreign key in an inline to be any where in the parent chain. Thanks sil for the report.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner
2008-08-29 17:41:40 +00:00
parent 3717e3bba3
commit d57d490b76
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/forms/models.py
View File

@@ -385,7 +385,7 @@ def _get_foreign_key(parent_model, model, fk_name=None):
fk = fks_to_parent[0]
if not isinstance(fk, ForeignKey) or \
(fk.rel.to != parent_model and
fk.rel.to not in parent_model._meta.parents.keys()):
fk.rel.to not in parent_model._meta.get_parent_list()):
raise Exception("fk_name '%s' is not a ForeignKey to %s" % (fk_name, parent_model))
elif len(fks_to_parent) == 0:
raise Exception("%s has no field named '%s'" % (model, fk_name))
@@ -395,7 +395,7 @@ def _get_foreign_key(parent_model, model, fk_name=None):
f for f in opts.fields
if isinstance(f, ForeignKey)
and (f.rel.to == parent_model
or f.rel.to in parent_model._meta.parents.keys())
or f.rel.to in parent_model._meta.get_parent_list())
]
if len(fks_to_parent) == 1:
fk = fks_to_parent[0]