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

Fixed #5794 -- Be more robust when rendering a DateTimeInput widget. Thanks, 

MikeH.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-10-22 13:13:12 +00:00
parent dbd1cb9083
commit 003b3c1a17
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/newforms/widgets.py
View File

@ -161,8 +161,11 @@ class DateTimeInput(Input):
self.format = format self.format = format
def render(self, name, value, attrs=None): def render(self, name, value, attrs=None):
return super(DateTimeInput, self).render(name, if value is None:
value.strftime(self.format), attrs) value = ''
elif hasattr(value, 'strftime'):
value = value.strftime(self.format)
return super(DateTimeInput, self).render(name, value, attrs)
class CheckboxInput(Widget): class CheckboxInput(Widget):
def __init__(self, attrs=None, check_test=bool): def __init__(self, attrs=None, check_test=bool):

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

@ -855,6 +855,8 @@ u'<input type="text" class="pretty" value="2006-01-10" name="date_0" /><input ty
# DateTimeInput ############################################################### # DateTimeInput ###############################################################
>>> w = DateTimeInput() >>> w = DateTimeInput()
>>> w.render('date', None)
u'<input type="text" name="date" />'
>>> d = datetime.datetime(2007, 9, 17, 12, 51, 34, 482548) >>> d = datetime.datetime(2007, 9, 17, 12, 51, 34, 482548)
>>> print d >>> print d
2007-09-17 12:51:34.482548 2007-09-17 12:51:34.482548