test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #8101 -- Allow the strings '1' and '0' as filter values for boolean 

fields (the latter was causing problems). This allows these values in URLs
(e.g. the admin filtering).

Not an ideal solution to the problem, but will do the job for the time being.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-08-29 02:40:56 +00:00
parent a1d2f6ef0c
commit 54f41e3507
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/db/models/fields/__init__.py
View File

@ -362,6 +362,15 @@ class BooleanField(Field):
raise exceptions.ValidationError( raise exceptions.ValidationError(
_("This value must be either True or False.")) _("This value must be either True or False."))
def get_db_prep_lookup(self, lookup_type, value):
# Special-case handling for filters coming from a web request (e.g. the
# admin interface). Only works for scalar values (not lists). If you're
# passing in a list, you might as well make things the right type when
# constructing the list.
if value in ('1', '0'):
value = bool(int(value))
return super(BooleanField, self).get_db_prep_lookup(lookup_type, value)
def get_db_prep_value(self, value): def get_db_prep_value(self, value):
if value is None: if value is None:
return None return None
@ -693,6 +702,15 @@ class NullBooleanField(Field):
raise exceptions.ValidationError( raise exceptions.ValidationError(
_("This value must be either None, True or False.")) _("This value must be either None, True or False."))
def get_db_prep_lookup(self, lookup_type, value):
# Special-case handling for filters coming from a web request (e.g. the
# admin interface). Only works for scalar values (not lists). If you're
# passing in a list, you might as well make things the right type when
# constructing the list.
if value in ('1', '0'):
value = bool(int(value))
return super(NullBooleanField, self).get_db_prep_lookup(lookup_type, value)
def get_db_prep_value(self, value): def get_db_prep_value(self, value):
if value is None: if value is None:
return None return None

26
tests/regressiontests/model_fields/tests.py
View File

@ -45,5 +45,31 @@ datetime.time(1, 2, 3, 4)
>>> f.to_python('01:02:03.999999') >>> f.to_python('01:02:03.999999')
datetime.time(1, 2, 3, 999999) datetime.time(1, 2, 3, 999999)
# Boolean and null boolean fields
>>> f = BooleanField()
>>> for val in (True, '1', 1):
... f.get_db_prep_lookup('exact', val)
[True]
[True]
[True]
>>> for val in (False, '0', 0):
... f.get_db_prep_lookup('exact', val)
[False]
[False]
[False]
>>> f = NullBooleanField()
>>> for val in (True, '1', 1):
... f.get_db_prep_lookup('exact', val)
[True]
[True]
[True]
>>> for val in (False, '0', 0):
... f.get_db_prep_lookup('exact', val)
[False]
[False]
[False]
>>> f.get_db_prep_lookup('exact', None)
[None]
""" """