Author: kmtracey
Date: 2010-03-16 14:08:49 -0500 (Tue, 16 Mar 2010)
New Revision: 12796
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/django/contrib/admin/views/main.py
django/branches/releases/1.1.X/tests/regressiontests/admin_views/models.py
django/branches/releases/1.1.X/tests/regressiontests/admin_views/tests.py
Log:
[1.1.X] Fixed #12105: Corrected handling of isnull=False lookups in admin.
Thanks marcob, Travis Cline, gabrielhurley.
r12795 backport from trunk.
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12579,12581,12584,12598-12599,12602,12605,12614,12616,12621-12622,12627,12630-12631,12635,12637,12639,12641,12644,12646,12648,12650,12652,12654,12657,12659,12661,12663,12665,12667,12669,12671,12673,12676,12679,12681,12683,12686,12688,12694,12696,12698,12700,12704-12705,12710-12712,12719,12721,12723,12725-12726,12728,12733-12734,12737,12739,12774
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11802,11808,11815,11817,11820,11822,11824,11826,11828,11831,11833,11835,11837,11839,11841,11844,11857,11864,11874,11876,11878,11885,11898,11901,11905,11909,11912,11914,11917,11938,11953,11961,11977,11979,11984,11986,11988,11990,11992,11994,11996,11998,12001,12004,12006,12011,12022,12024,12044-12045,12048,12054-12056,12059,12064,12066,12068,12070,12079,12086,12088,12104,12118,12132,12137-12138,12140-12141,12144,12150-12152,12220-12221,12229,12249,12253,12276,12282,12284,12293,12313,12317-12324,12333,12341,12343,12346,12353,12362,12379,12384,12398,12405,12408-12411,12419-12420,12423,12425-12426,12429,12434,12436,12439-12442,12447-12448,12457,12461-12464,12467,12471,12473,12475,12484,12489-12490,12492,12497-12498,12502,12505,12513,12515-12516,12518,12523,12526,12528,12533,12535,12537,12539,12541,12548,12553,12556,12558-12560,12562,12567,12569-12570,12573,12576,12579,12581,12584,12598-12599,12602,12605,12614,12616,12621-12622,12627,12630-12631,12635,12637,12639,12641,12644,12646,12648,12650,12652,12654,12657,12659,12661,12663,12665,12667,12669,12671,12673,12676,12679,12681,12683,12686,12688,12694,12696,12698,12700,12704-12705,12710-12712,12719,12721,12723,12725-12726,12728,12733-12734,12737,12739,12774,12795
Modified: django/branches/releases/1.1.X/django/contrib/admin/views/main.py
===================================================================
--- django/branches/releases/1.1.X/django/contrib/admin/views/main.py
2010-03-16 19:01:40 UTC (rev 12795)
+++ django/branches/releases/1.1.X/django/contrib/admin/views/main.py
2010-03-16 19:08:49 UTC (rev 12796)
@@ -185,6 +185,13 @@
if key.endswith('__in'):
lookup_params[key] = value.split(',')
+ # if key ends with __isnull, special case '' and false
+ if key.endswith('__isnull'):
+ if value.lower() in ('', 'false'):
+ lookup_params[key] = False
+ else:
+ lookup_params[key] = True
+
# Apply lookup parameters from the query string.
try:
qs = qs.filter(**lookup_params)
Modified:
django/branches/releases/1.1.X/tests/regressiontests/admin_views/models.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/admin_views/models.py
2010-03-16 19:01:40 UTC (rev 12795)
+++ django/branches/releases/1.1.X/tests/regressiontests/admin_views/models.py
2010-03-16 19:08:49 UTC (rev 12796)
@@ -26,7 +26,7 @@
title = models.CharField(max_length=100)
content = models.TextField()
date = models.DateTimeField()
- section = models.ForeignKey(Section)
+ section = models.ForeignKey(Section, null=True, blank=True)
def __unicode__(self):
return self.title
Modified:
django/branches/releases/1.1.X/tests/regressiontests/admin_views/tests.py
===================================================================
--- django/branches/releases/1.1.X/tests/regressiontests/admin_views/tests.py
2010-03-16 19:01:40 UTC (rev 12795)
+++ django/branches/releases/1.1.X/tests/regressiontests/admin_views/tests.py
2010-03-16 19:08:49 UTC (rev 12796)
@@ -216,6 +216,16 @@
response = self.client.get('/test_admin/%s/admin_views/thing/' %
self.urlbit, {'color__id__exact': 'StringNotInteger!'})
self.assertRedirects(response, '/test_admin/%s/admin_views/thing/?e=1'
% self.urlbit)
+ def testIsNullLookups(self):
+ """Ensure is_null is handled correctly."""
+ Article.objects.create(title="I Could Go Anywhere",
content="Versatile", date=datetime.datetime.now())
+ response = self.client.get('/test_admin/%s/admin_views/article/' %
self.urlbit)
+ self.failUnless('4 articles' in response.content, '"4 articles"
missing from response')
+ response = self.client.get('/test_admin/%s/admin_views/article/' %
self.urlbit, {'section__isnull': 'false'})
+ self.failUnless('3 articles' in response.content, '"3 articles"
missing from response')
+ response = self.client.get('/test_admin/%s/admin_views/article/' %
self.urlbit, {'section__isnull': 'true'})
+ self.failUnless('1 article' in response.content, '"1 article" missing
from response')
+
def testLogoutAndPasswordChangeURLs(self):
response = self.client.get('/test_admin/%s/admin_views/article/' %
self.urlbit)
self.failIf('<a href="/test_admin/%s/logout/">' % self.urlbit not in
response.content)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
