Ticket #4428: new_datetimefield_millisecond.diff

django/newforms/fields.py

@@ -11 +11 @@
 from django.utils.encoding import StrAndUnicode, smart_unicode
 
 from util import ErrorList, ValidationError
-from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple
+from widgets import (TextInput, PasswordInput, HiddenInput,
+                     MultipleHiddenInput, FileInput, CheckboxInput, Select,
+                     NullBooleanSelect, SelectMultiple, DateTimeInput)
 
 try:
     from decimal import Decimal, DecimalException
@@ -284 +286 @@
 )
 
 class DateTimeField(Field):
+    widget = DateTimeInput
     def __init__(self, input_formats=None, *args, **kwargs):
         super(DateTimeField, self).__init__(*args, **kwargs)
         self.input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS

django/newforms/widgets.py

@@ -7 +7 @@
 except NameError:
     from sets import Set as set   # Python 2.3 fallback
 
+try:
+    import settings
+except ImportError:
+    pass
+
 from itertools import chain
 from django.utils.datastructures import MultiValueDict
 from django.utils.html import escape
@@ -15 +20 @@
 from util import flatatt
 
 __all__ = (
-    'Widget', 'TextInput', 'PasswordInput',
+    'Widget', 'TextInput', 'DateTimeInput', 'PasswordInput',
     'HiddenInput', 'MultipleHiddenInput',
     'FileInput', 'Textarea', 'CheckboxInput',
     'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect',
@@ -84 +89 @@
 class TextInput(Input):
     input_type = 'text'
 
+class DateTimeInput(Input):
+    input_type = 'text'
+    
+    def __init__(self, attrs=None, format=None):
+        self.attrs = attrs or {}
+        self.format = format
+        if not self.format:
+            try:
+                self.format = settings.DATETIME_FORMAT
+            except: # Silently catch exceptions
+                self.format = 'Y-m-d h:i:s'
+
+    def render(self, name, value, attrs=None):
+        from django.utils.dateformat import format
+        return super(DateTimeInput, self).render(name,
+                                                 format(value, self.format),
+                                                 attrs)    
+
 class PasswordInput(Input):
     input_type = 'password'
 

tests/regressiontests/forms/tests.py

@@ -848 +848 @@
 >>> 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" />'
 
+# DateTimeInput ###############################################################
+
+>>> w = DateTimeInput()
+>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51, 34, 482548))
+u'<input type="text" name="date" value="2007-09-17 12:51:34" />'
+>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51, 34))
+u'<input type="text" name="date" value="2007-09-17 12:51:34" />'
+>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51))
+u'<input type="text" name="date" value="2007-09-17 12:51:00" />'
+>>> w = DateTimeInput(format='h:i:s')
+>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51, 34, 482548))
+u'<input type="text" name="date" value="12:51:34" />'
+>>> w = DateTimeInput(format='x:c:p')
+>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51, 34, 482548))
+u'<input type="text" name="date" value="x:c:p" />'
+
 ##########
 # Fields #
 ##########