Commit 8c31bb7c authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] Fixed #6035 -- Gave the SplitDateTimeField the proper default widget. Thanks dtulig. 

r9385 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 4a3dcd7f

django/forms/fields.py

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ from django.utils.translation import ugettext_lazy as _ 
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 @@ class FilePathField(ChoiceField): 
        self.widget.choices = self.choices



class SplitDateTimeField(MultiValueField):

    widget = SplitDateTimeWidget

    hidden_widget = SplitHiddenDateTimeWidget

    default_error_messages = {

        'invalid_date': _(u'Enter a valid date.'),

tests/regressiontests/forms/fields.py

+2 −0
Original line number Diff line number Diff line
@@ -1322,6 +1322,8 @@ u'.../django/forms/fields.py' 
# 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)