Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #6035 -- Gave the SplitDateTimeField the proper default widget.…

… Thanks dtulig.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8cdc53a265cfbf72ae87aa607a95f4a7eb9a3ac3 1 parent 6ed9123
@kmtracey kmtracey authored
View
3  django/forms/fields.py
@@ -28,7 +28,7 @@
from django.utils.encoding import smart_unicode, smart_str
from util import ErrorList, ValidationError
-from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput, TimeInput, SplitHiddenDateTimeWidget
+from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput, TimeInput, SplitDateTimeWidget, SplitHiddenDateTimeWidget
from django.core.files.uploadedfile import SimpleUploadedFile as UploadedFile
__all__ = (
@@ -843,6 +843,7 @@ def __init__(self, path, match=None, recursive=False, required=True,
self.widget.choices = self.choices
class SplitDateTimeField(MultiValueField):
+ widget = SplitDateTimeWidget
hidden_widget = SplitHiddenDateTimeWidget
default_error_messages = {
'invalid_date': _(u'Enter a valid date.'),
View
2  tests/regressiontests/forms/fields.py
@@ -1322,6 +1322,8 @@
# SplitDateTimeField ##########################################################
>>> f = SplitDateTimeField()
+>>> f.widget
+<django.forms.widgets.SplitDateTimeWidget object ...
>>> f.clean([datetime.date(2006, 1, 10), datetime.time(7, 30)])
datetime.datetime(2006, 1, 10, 7, 30)
>>> f.clean(None)
Please sign in to comment.
Something went wrong with that request. Please try again.