mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #17210 -- Made NullBooleanSelect use unknown/true/false as query data.

Browse Source
This commit is contained in:
Basil Dubyk
2018-11-14 20:43:34 +02:00
committed by Tim Graham
parent ca2856fb62
commit 35a08b8541
4 changed files with 126 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
django/forms/widgets.py
View File

@@ -696,27 +696,35 @@ class NullBooleanSelect(Select):
"""
def __init__(self, attrs=None):
choices = (
('1', _('Unknown')),
('2', _('Yes')),
('3', _('No')),
('unknown', _('Unknown')),
('true', _('Yes')),
('false', _('No')),
)
super().__init__(attrs, choices)
def format_value(self, value):
try:
return {True: '2', False: '3', '2': '2', '3': '3'}[value]
return {
True: 'true', False: 'false',
'true': 'true', 'false': 'false',
# For backwards compatibility with Django < 2.2.
'2': 'true', '3': 'false',
}[value]
except KeyError:
return '1'
return 'unknown'
def value_from_datadict(self, data, files, name):
value = data.get(name)
return {
'2': True,
True: True,
'True': True,
'3': False,
'False': False,
False: False,
'true': True,
'false': False,
# For backwards compatibility with Django < 2.2.
'2': True,
'3': False,
}.get(value)