From 655d5afea9d1f3d5aa55efc9fe77a14b353e35a6 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Fri, 28 Jan 2011 14:08:42 +0000 Subject: Fixed #14880 - raw_id_fields in admin does not work when limit_choices_to dictionary has value=False Thanks to smallming for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15348 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_views/models.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'tests/regressiontests/admin_views/models.py') diff --git a/tests/regressiontests/admin_views/models.py b/tests/regressiontests/admin_views/models.py index 08a2d36c3f..02c6b9208d 100644 --- a/tests/regressiontests/admin_views/models.py +++ b/tests/regressiontests/admin_views/models.py @@ -187,17 +187,27 @@ class Actor(models.Model): class Inquisition(models.Model): expected = models.BooleanField() leader = models.ForeignKey(Actor) + country = models.CharField(max_length=20) + def __unicode__(self): - return self.expected + return u"by %s from %s" % (self.leader, self.country) + +class InquisitionAdmin(admin.ModelAdmin): + list_display = ('leader', 'country', 'expected') class Sketch(models.Model): title = models.CharField(max_length=100) inquisition = models.ForeignKey(Inquisition, limit_choices_to={'leader__name': 'Palin', 'leader__age': 27, + 'expected': False, }) + def __unicode__(self): return self.title +class SketchAdmin(admin.ModelAdmin): + raw_id_fields = ('inquisition',) + class Fabric(models.Model): NG_CHOICES = ( ('Textured', ( @@ -663,8 +673,8 @@ admin.site.register(ModelWithStringPrimaryKey) admin.site.register(Color) admin.site.register(Thing, ThingAdmin) admin.site.register(Actor) -admin.site.register(Inquisition) -admin.site.register(Sketch) +admin.site.register(Inquisition, InquisitionAdmin) +admin.site.register(Sketch, SketchAdmin) admin.site.register(Person, PersonAdmin) admin.site.register(Persona, PersonaAdmin) admin.site.register(Subscriber, SubscriberAdmin) -- cgit v1.3