Changeset 8691

Timestamp:

08/28/08 21:40:56 (3 months ago)

Author:

mtredinnick

Message:

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.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/model_fields/tests.py (modified) (1 diff)

django/trunk/django/db/models/fields/__init__.py

@@ -363 +363 @@
-            _("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):
-        if value is None:
@@ -694 +703 @@
-            _("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):
-        if value is None:

django/trunk/tests/regressiontests/model_fields/tests.py

@@ -46 +46 @@
-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]
-
-"""