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

[1.0.X] Fixed #10288 -- Corrected _has_changed handling of DateTimeInput when a custom date/time format is in use. Thanks to Koen Biermans for the report and patch.

Browse Source 
Merge of r10641 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2009-05-13 14:31:39 +00:00
parent cc96ed9ecd
commit 17d214a982
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
django/forms/widgets.py
View File

@ -295,14 +295,21 @@ class DateTimeInput(Input):
if format: if format:
self.format = format self.format = format
def render(self, name, value, attrs=None): def _format_value(self, value):
if value is None: if value is None:
value = '' return ''
elif hasattr(value, 'strftime'): elif hasattr(value, 'strftime'):
value = datetime_safe.new_datetime(value) value = datetime_safe.new_datetime(value)
value = value.strftime(self.format) return value.strftime(self.format)
return value
def render(self, name, value, attrs=None):
value = self._format_value(value)
return super(DateTimeInput, self).render(name, value, attrs) return super(DateTimeInput, self).render(name, value, attrs)
def _has_changed(self, initial, data):
return super(DateTimeInput, self)._has_changed(self._format_value(initial), data)
class TimeInput(Input): class TimeInput(Input):
input_type = 'text' input_type = 'text'
@ -400,11 +407,11 @@ class NullBooleanSelect(Select):
def value_from_datadict(self, data, files, name): def value_from_datadict(self, data, files, name):
value = data.get(name, None) value = data.get(name, None)
return {u'2': True, return {u'2': True,
True: True, True: True,
'True': True, 'True': True,
u'3': False, u'3': False,
'False': False, 'False': False,
False: False}.get(value, None) False: False}.get(value, None)
def _has_changed(self, initial, data): def _has_changed(self, initial, data):

11
tests/regressiontests/forms/widgets.py
View File

@ -1071,9 +1071,9 @@ included on both widgets.
>>> w.render('date', datetime.datetime(2006, 1, 10, 7, 30)) >>> w.render('date', datetime.datetime(2006, 1, 10, 7, 30))
u'<input type="text" class="pretty" value="2006-01-10" name="date_0" /><input type="text" class="pretty" value="07:30:00" name="date_1" />' u'<input type="text" class="pretty" value="2006-01-10" name="date_0" /><input type="text" class="pretty" value="07:30:00" name="date_1" />'
>>> w._has_changed(datetime.datetime(2008, 5, 5, 12, 40, 00), [u'2008-05-05', u'12:40:00']) >>> w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), [u'2008-05-06', u'12:40:00'])
False False
>>> w._has_changed(datetime.datetime(2008, 5, 5, 12, 40, 00), [u'2008-05-05', u'12:41:00']) >>> w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), [u'2008-05-06', u'12:41:00'])
True True
# DateTimeInput ############################################################### # DateTimeInput ###############################################################
@ -1093,6 +1093,13 @@ u'<input type="text" name="date" value="2007-09-17 12:51:34" />'
>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51)) >>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51))
u'<input type="text" name="date" value="2007-09-17 12:51:00" />' u'<input type="text" name="date" value="2007-09-17 12:51:00" />'
Use 'format' to change the way a value is displayed.
>>> w = DateTimeInput(format='%d/%m/%Y %H:%M')
>>> w.render('date', d)
u'<input type="text" name="date" value="17/09/2007 12:51" />'
>>> w._has_changed(d, '17/09/2007 12:51')
False
# TimeInput ################################################################### # TimeInput ###################################################################
>>> w = TimeInput() >>> w = TimeInput()