test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved the call to _get_foreign_key to run in all cases catching incorrect inline setup sooner. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Brian Rosner 2009-10-19 19:17:20 +00:00
parent 5fc35c9caf
commit cb7a3262b5
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/validation.py
View File

@ -149,6 +149,9 @@ def validate(cls, model):
validate_inline(inline, cls, model) validate_inline(inline, cls, model)
def validate_inline(cls, parent, parent_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 # model is already verified to exist and be a Model
if cls.fk_name: # default value is None if cls.fk_name: # default value is None
f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name) f = get_field(cls, cls.model, cls.model._meta, 'fk_name', cls.fk_name)
@ -169,7 +172,6 @@ def validate_inline(cls, parent, parent_model):
# exclude # exclude
if hasattr(cls, 'exclude') and cls.exclude: if hasattr(cls, 'exclude') and cls.exclude:
fk = _get_foreign_key(parent_model, cls.model, fk_name=cls.fk_name, can_fail=True)
if fk and fk.name in cls.exclude: if fk and fk.name in cls.exclude:
raise ImproperlyConfigured("%s cannot exclude the field " raise ImproperlyConfigured("%s cannot exclude the field "
"'%s' - this is the foreign key to the parent model " "'%s' - this is the foreign key to the parent model "

24
tests/regressiontests/admin_validation/models.py
View File

@ -20,7 +20,7 @@ class Song(models.Model):
return self.title return self.title
class Model11709(models.Model): class TwoAlbumFKAndAnE(models.Model):
album1 = models.ForeignKey(Album, related_name="album1_set") album1 = models.ForeignKey(Album, related_name="album1_set")
album2 = models.ForeignKey(Album, related_name="album2_set") album2 = models.ForeignKey(Album, related_name="album2_set")
e = models.CharField(max_length=1) e = models.CharField(max_length=1)
@ -72,11 +72,27 @@ ImproperlyConfigured: SongInline cannot exclude the field 'album' - this is the
# given) make sure fk_name is honored or things blow up when there is more # given) make sure fk_name is honored or things blow up when there is more
# than one fk to the parent model. # than one fk to the parent model.
>>> class Model11709Inline(admin.TabularInline): >>> class TwoAlbumFKAndAnEInline(admin.TabularInline):
... model = Model11709 ... model = TwoAlbumFKAndAnE
... exclude = ("e",) ... exclude = ("e",)
... fk_name = "album1" ... fk_name = "album1"
>>> validate_inline(Model11709Inline, None, Album) >>> validate_inline(TwoAlbumFKAndAnEInline, None, Album)
# Ensure inlines validate that they can be used correctly.
>>> class TwoAlbumFKAndAnEInline(admin.TabularInline):
... model = TwoAlbumFKAndAnE
>>> validate_inline(TwoAlbumFKAndAnEInline, None, Album)
Traceback (most recent call last):
...
Exception: <class 'regressiontests.admin_validation.models.TwoAlbumFKAndAnE'> has more than 1 ForeignKey to <class 'regressiontests.admin_validation.models.Album'>
>>> class TwoAlbumFKAndAnEInline(admin.TabularInline):
... model = TwoAlbumFKAndAnE
... fk_name = "album1"
>>> validate_inline(TwoAlbumFKAndAnEInline, None, Album)
"""} """}