Fixed #14670 -- Made GenericTabularInline aware of changes made in r13708. Thanks, gregmuellegger.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14555 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/regressiontests/generic_inline_admin/models.py b/tests/regressiontests/generic_inline_admin/models.py
index 329c4877eb..fb6363e2bb 100644
--- a/tests/regressiontests/generic_inline_admin/models.py
+++ b/tests/regressiontests/generic_inline_admin/models.py
@@ -76,11 +76,15 @@ admin.site.register(EpisodeExclude, inlines=[MediaExcludeInline])
 # Generic inline with unique_together
 #
 
+class Category(models.Model):
+    name = models.CharField(max_length=50)
+
 class PhoneNumber(models.Model):
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
     content_object = generic.GenericForeignKey('content_type', 'object_id')
     phone_number = models.CharField(max_length=30)
+    category = models.ForeignKey(Category, null=True, blank=True)
 
     class Meta:
         unique_together = (('content_type', 'object_id', 'phone_number',),)
@@ -93,6 +97,7 @@ class PhoneNumberInline(generic.GenericTabularInline):
     model = PhoneNumber
 
 admin.site.register(Contact, inlines=[PhoneNumberInline])
+admin.site.register(Category)
 
 #
 # Generic inline with can_delete=False