Changeset 8491

Timestamp:

08/23/08 12:33:09 (3 months ago)

Author:

mtredinnick

Message:

Fixed #7499 -- Trim microseconds off rendering of form.TimeFields? by default so
that they validate. Previous code didn't work with microseconds anyway, so this
is backwards compatible. Thanks to kevin for the patch.

Files:

• django/trunk/django/forms/fields.py (modified) (3 diffs)
• django/trunk/django/forms/widgets.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/forms/widgets.py (modified) (1 diff)

django/trunk/django/forms/fields.py

@@ -28 +28 @@
-
-from util import ErrorList, ValidationError
-
+, TimeInput
-from django.core.files.uploadedfile import SimpleUploadedFile as UploadedFile
-
@@ -35 +35 @@
-    'DEFAULT_DATE_INPUT_FORMATS', 'DateField',
-    'DEFAULT_TIME_INPUT_FORMATS', 'TimeField',
-
+ 'TimeField',
-    'RegexField', 'EmailField', 'FileField', 'ImageField', 'URLField',
-    'BooleanField', 'NullBooleanField', 'ChoiceField', 'MultipleChoiceField',
@@ -312 +312 @@
-
-class TimeField(Field):
+    widget = TimeInput()
-    default_error_messages = {
-        'invalid': _(u'Enter a valid time.')

django/trunk/django/forms/widgets.py

@@ -23 +23 @@
-    'Media', 'MediaDefiningClass', 'Widget', 'TextInput', 'PasswordInput',
-    'HiddenInput', 'MultipleHiddenInput',
-
+imeInput', 'T
-    'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect',
-    'CheckboxSelectMultiple', 'MultiWidget', 'SplitDateTimeWidget',
@@ -301 +301 @@
-            value = value.strftime(self.format)
-        return super(DateTimeInput, self).render(name, value, attrs)
+
+class TimeInput(Input):
+    input_type = 'text'
+
+    def render(self, name, value, attrs=None):
+        if value is None:
+            value = ''
+        elif hasattr(value, 'replace'):
+            value = value.replace(microsecond=0)
+        return super(TimeInput, self).render(name, value, attrs)
-
-class CheckboxInput(Widget):

django/trunk/tests/regressiontests/forms/widgets.py

@@ -1088 +1088 @@
->>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51))
-u'<input type="text" name="date" value="2007-09-17 12:51:00" />'
+
+# TimeInput ###############################################################
+
+>>> w = TimeInput()
+>>> w.render('time', None)
+u'<input type="text" name="time" />'
+>>> t = datetime.time(12, 51, 34, 482548)
+>>> print t
+12:51:34.482548
+
+The microseconds are trimmed on display, by default.
+>>> w.render('time', t)
+u'<input type="text" name="time" value="12:51:34" />'
+>>> w.render('time', datetime.time(12, 51, 34))
+u'<input type="text" name="time" value="12:51:34" />'
+>>> w.render('time', datetime.time(12, 51))
+u'<input type="text" name="time" value="12:51:00" />'
-"""
+