Ticket #3533: dateortime_widget.patch

django/newforms/widgets.py

@@ -4 +4 @@
 
 __all__ = (
     'Widget', 'TextInput', 'PasswordInput', 'HiddenInput', 'MultipleHiddenInput',
-    'FileInput', 'Textarea', 'CheckboxInput',
+    'FileInput', 'Textarea', 'CheckboxInput', 'DateOrTimeTextInput',
     'Select', 'NullBooleanSelect', 'SelectMultiple', 'RadioSelect', 'CheckboxSelectMultiple',
     'MultiWidget', 'SplitDateTimeWidget',
 )
@@ -14 +14 @@
 from django.utils.html import escape
 from django.utils.translation import gettext
 from itertools import chain
+from datetime import date, datetime, time
 
 try:
     set # Only available in Python 2.4+
@@ -116 +117 @@
 class FileInput(Input):
     input_type = 'file'
 
+class DateOrTimeTextInput(TextInput):
+    """
+    A widget that renders date, datetime and time values using a specific format.
+    """
+    def __init__(self, attrs=None, format='%Y-%m-%d'):
+        self.format = format
+        super(DateOrTimeTextInput, self).__init__(attrs)
+
+    def render(self, name, value, attrs=None):
+        if isinstance(value, (date, datetime, time)):
+            value = value.strftime(self.format)
+        return super(DateOrTimeTextInput, self).render(name, value, attrs)
+
 class Textarea(Widget):
     def render(self, name, value, attrs=None):
         if value is None: value = ''
@@ -343 +357 @@
     """
     A Widget that splits datetime input into two <input type="text"> boxes.
     """
-    def __init__(self, attrs=None):
-        widgets = (TextInput(attrs=attrs), TextInput(attrs=attrs))
+    def __init__(self, attrs=None, date_format='%Y-%m-%d', time_format='%H:%M:%S'):
+        widgets = (DateOrTimeTextInput(attrs=attrs, format=date_format),
+                   DateOrTimeTextInput(attrs=attrs, format=time_format))
         super(SplitDateTimeWidget, self).__init__(widgets, attrs)
 
     def decompress(self, value):

tests/regressiontests/forms/tests.py

@@ -186 +186 @@
 >>> w.render('email', 'ŠĐĆŽćžšđ', attrs={'class': 'fun'})
 u'<input type="file" class="fun" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" name="email" />'
 
+# DateOrTimeTextInput Widget ##################################################
+
+>>> test_time = datetime.datetime(2006, 1, 10, 13, 30)
+
+>>> w = DateOrTimeTextInput()
+>>> w.render('date', None)
+u'<input type="text" name="date" />'
+>>> w.render('date', 'non-date')
+u'<input type="text" name="date" value="non-date" />'
+
+Defaults to %Y-%m-%d
+>>> w.render('date', test_time)
+u'<input type="text" name="date" value="2006-01-10" />'
+
+Pass 'format' attribute to change the strftime when rendering.
+>>> w = DateOrTimeTextInput(format='%m/%d/%Y')
+>>> w.render('date', test_time)
+u'<input type="text" name="date" value="01/10/2006" />'
+>>> w = DateOrTimeTextInput(format='%H:%M:%S')
+>>> w.render('time', test_time)
+u'<input type="text" name="time" value="13:30:00" />'
+
+Works with time and date objects too
+>>> w = DateOrTimeTextInput(format='%H:%M:%S')
+>>> w.render('time', test_time.time())
+u'<input type="text" name="time" value="13:30:00" />'
+>>> w = DateOrTimeTextInput(format='%m/%d/%Y')
+>>> w.render('date', test_time.date())
+u'<input type="text" name="date" value="01/10/2006" />'
+
 # Textarea Widget #############################################################
 
 >>> w = Textarea()
@@ -787 +817 @@
 >>> 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" />'
 
+You can also pass 'date_format' and 'time_format' to change the strftime format for the date and time.
+>>> w = SplitDateTimeWidget(date_format='%m/%d/%Y', time_format='%#I:%M %p')
+>>> w.render('date', datetime.datetime(2006, 1, 10, 7, 30))
+u'<input type="text" name="date_0" value="01/10/2006" /><input type="text" name="date_1" value="7:30 AM" />'
+
 ##########
 # Fields #
 ##########