innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.1.X] Fixed #12105: Corrected handling of isnull=False lookups in admin. Thanks marcob, Travis Cline, gabrielhurley. 

r12795 backport from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2010-03-16 19:08:49 +00:00
parent 9b85ef2895
commit e15c850f1b
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/admin/views/main.py
View File

@ -185,6 +185,13 @@ class ChangeList(object):
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)

2
tests/regressiontests/admin_views/models.py
View File

@ -26,7 +26,7 @@ class Article(models.Model):
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

10
tests/regressiontests/admin_views/tests.py
View File

@ -216,6 +216,16 @@ class AdminViewBasicTest(TestCase):
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)