diff options
| author | Brian Rosner <brosner@gmail.com> | 2009-10-23 20:48:52 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2009-10-23 20:48:52 +0000 |
| commit | b06d1be7644a6c6a48745bea193d5649e67bc3b4 (patch) | |
| tree | 6de534fa01219f9c4092db3c4e695626861addc0 | |
| parent | aaa9ccfe141f772baa8e08a7815f975e1ab29326 (diff) | |
[1.1.X] Moved _get_foreign_key call after testing for fk_name fixing a broken test.
Backport of [11643] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/validation.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/admin/validation.py b/django/contrib/admin/validation.py index 595b951b9e..05e5c6d300 100644 --- a/django/contrib/admin/validation.py +++ b/django/contrib/admin/validation.py @@ -150,14 +150,15 @@ def validate(cls, model): def validate_inline(cls, parent, parent_model): - fk = _get_foreign_key(parent_model, cls.model, fk_name=cls.fk_name, can_fail=True) - # model is already verified to exist and be a Model if cls.fk_name: # default value is None f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name) if not isinstance(f, models.ForeignKey): raise ImproperlyConfigured("'%s.fk_name is not an instance of " "models.ForeignKey." % cls.__name__) + + fk = _get_foreign_key(parent_model, cls.model, fk_name=cls.fk_name, can_fail=True) + # extra = 3 # max_num = 0 for attr in ('extra', 'max_num'): |