Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Fixed #14880 - raw_id_fields in admin does not work when limi…

…t_choices_to dictionary has value=False

Thanks to smallming for the report.

Backport of [15348] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit b3ad41bfd51562e5d18350b18650ad4638ed0869 1 parent 276ecc7
@spookylukey spookylukey authored
View
3  django/contrib/admin/widgets.py
@@ -111,6 +111,9 @@ def url_params_from_lookup_dict(lookups):
for k, v in lookups.items():
if isinstance(v, list):
v = u','.join([str(x) for x in v])
+ elif isinstance(v, bool):
+ # See django.db.fields.BooleanField.get_prep_lookup
+ v = ('0', '1')[v]
else:
v = unicode(v)
items.append((k, v))
View
16 tests/regressiontests/admin_views/models.py
@@ -160,17 +160,27 @@ def __unicode__(self):
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', (
@@ -626,8 +636,8 @@ class WorkHourAdmin(admin.ModelAdmin):
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)
View
36 tests/regressiontests/admin_views/tests.py
@@ -2,6 +2,7 @@
import re
import datetime
+import urlparse
from django.conf import settings
from django.core.exceptions import SuspiciousOperation
@@ -28,7 +29,7 @@
FooAccount, Gallery, ModelWithStringPrimaryKey, \
Person, Persona, Picture, Podcast, Section, Subscriber, Vodcast, \
Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit, \
- Category, Post, Plot, FunkyTag, WorkHour, Employee
+ Category, Post, Plot, FunkyTag, WorkHour, Employee, Inquisition, Actor
class AdminViewBasicTest(TestCase):
@@ -2181,6 +2182,39 @@ def test_readonly_manytomany(self):
response = self.client.get('/test_admin/admin/admin_views/pizza/add/')
self.assertEqual(response.status_code, 200)
+
+class RawIdFieldsTest(TestCase):
+ fixtures = ['admin-views-users.xml']
+
+ def setUp(self):
+ self.client.login(username='super', password='secret')
+
+ def tearDown(self):
+ self.client.logout()
+
+ def test_limit_choices_to(self):
+ """Regression test for 14880"""
+ # This includes tests integers, strings and booleans in the lookup query string
+ actor = Actor.objects.create(name="Palin", age=27)
+ inquisition1 = Inquisition.objects.create(expected=True,
+ leader=actor,
+ country="England")
+ inquisition2 = Inquisition.objects.create(expected=False,
+ leader=actor,
+ country="Spain")
+ response = self.client.get('/test_admin/admin/admin_views/sketch/add/')
+ # Find the link
+ m = re.search(r'<a href="([^"]*)"[^>]* id="lookup_id_inquisition"', response.content)
+ self.assertTrue(m) # Got a match
+ popup_url = m.groups()[0].replace("&amp;", "&")
+
+ # Handle relative links
+ popup_url = urlparse.urljoin(response.request['PATH_INFO'], popup_url)
+ # Get the popup
+ response2 = self.client.get(popup_url)
+ self.assertContains(response2, "Spain")
+ self.assertNotContains(response2, "England")
+
class UserAdminTest(TestCase):
"""
Tests user CRUD functionality.
Please sign in to comment.
Something went wrong with that request. Please try again.