mirror of
https://github.com/django/django.git
synced 2024-12-25 10:35:48 +00:00
Updated TimeInput
changes from [8491] to allow time widgets to be used with unicode values. Fixes #7499.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
7e06b69a3d
commit
cbd574881c
@ -16,6 +16,7 @@ from django.utils.translation import ugettext
|
|||||||
from django.utils.encoding import StrAndUnicode, force_unicode
|
from django.utils.encoding import StrAndUnicode, force_unicode
|
||||||
from django.utils.safestring import mark_safe
|
from django.utils.safestring import mark_safe
|
||||||
from django.utils import datetime_safe
|
from django.utils import datetime_safe
|
||||||
|
from datetime import time
|
||||||
from util import flatatt
|
from util import flatatt
|
||||||
from urlparse import urljoin
|
from urlparse import urljoin
|
||||||
|
|
||||||
@ -307,7 +308,7 @@ class TimeInput(Input):
|
|||||||
def render(self, name, value, attrs=None):
|
def render(self, name, value, attrs=None):
|
||||||
if value is None:
|
if value is None:
|
||||||
value = ''
|
value = ''
|
||||||
elif hasattr(value, 'replace'):
|
elif isinstance(value, time):
|
||||||
value = value.replace(microsecond=0)
|
value = value.replace(microsecond=0)
|
||||||
return super(TimeInput, self).render(name, value, attrs)
|
return super(TimeInput, self).render(name, value, attrs)
|
||||||
|
|
||||||
|
@ -1104,5 +1104,9 @@ u'<input type="text" name="time" value="12:51:34" />'
|
|||||||
u'<input type="text" name="time" value="12:51:34" />'
|
u'<input type="text" name="time" value="12:51:34" />'
|
||||||
>>> w.render('time', datetime.time(12, 51))
|
>>> w.render('time', datetime.time(12, 51))
|
||||||
u'<input type="text" name="time" value="12:51:00" />'
|
u'<input type="text" name="time" value="12:51:00" />'
|
||||||
|
|
||||||
|
We should be able to initialize from a unicode value.
|
||||||
|
>>> w.render('time', u'13:12:11')
|
||||||
|
u'<input type="text" name="time" value="13:12:11" />'
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user