mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #17401 -- Made SelectDateWidget.render reflect wrong value

Browse Source 
Thanks Marcin Wrobel for the initial patch.
This commit is contained in:
Claude Paroz
2015-03-01 21:21:26 +01:00
parent 23c612199a
commit 4b8979e477
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
django/forms/widgets.py
View File

@@ -977,10 +977,10 @@ class SelectDateWidget(Widget):
year_val, month_val, day_val = v.year, v.month, v.day year_val, month_val, day_val = v.year, v.month, v.day
except ValueError: except ValueError:
pass pass
else: if year_val is None:
match = self.date_re.match(value) match = self.date_re.match(value)
if match: if match:
year_val, month_val, day_val = [int(v) for v in match.groups()] year_val, month_val, day_val = [int(val) for val in match.groups()]
html = {} html = {}
choices = [(i, i) for i in self.years] choices = [(i, i) for i in self.years]
html['year'] = self.create_select(name, self.year_field, value, year_val, choices, self.year_none_value) html['year'] = self.create_select(name, self.year_field, value, year_val, choices, self.year_none_value)

3
tests/forms_tests/tests/test_widgets.py
View File

@@ -1875,6 +1875,9 @@ class SelectDateWidgetTests(TestCase):
""", """,
) )
# Even with an invalid date, the widget should reflect the entered value (#17401).
self.assertEqual(w.render('mydate', '2010-02-30').count('selected="selected"'), 3)
# Years before 1900 work # Years before 1900 work
w = SelectDateWidget(years=('1899',)) w = SelectDateWidget(years=('1899',))
self.assertEqual( self.assertEqual(