diff options
| author | Brian Rosner <brosner@gmail.com> | 2009-10-19 19:20:52 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2009-10-19 19:20:52 +0000 |
| commit | fb8653ad0e4f4a927c82ea8009dbd3877412e4db (patch) | |
| tree | cf046a73183d69a4db0cca47fc7a36327b23f3e5 /django | |
| parent | 72bc0818ddb75113df1038d31ae6076d569df573 (diff) | |
[1.1.X] Fixed #11709 — Pass inline fk_name attribute when grabbing foreign key to test for exclusion. Thanks yishaibeeri for the report.
Backport of [11630] from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/validation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py index 50e41437b8..758090f896 100644 --- a/django/contrib/admin/validation.py +++ b/django/contrib/admin/validation.py @@ -169,7 +169,7 @@ def validate_inline(cls, parent, parent_model): # exclude if hasattr(cls, 'exclude') and cls.exclude: - fk = _get_foreign_key(parent_model, cls.model, can_fail=True) + fk = _get_foreign_key(parent_model, cls.model, fk_name=cls.fk_name, can_fail=True) if fk and fk.name in cls.exclude: raise ImproperlyConfigured("%s cannot exclude the field " "'%s' - this is the foreign key to the parent model " |