mirror of
https://github.com/django/django.git
synced 2025-10-23 21:59:11 +00:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user