Skip to content

Commit 0c2b20c

Browse files
committed
Use datetime value to render datetime-local input_type
1 parent b39982b commit 0c2b20c

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

rest_framework/renderers.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,15 +342,12 @@ def render_field(self, field, parent_style):
342342
# Get a clone of the field with text-only value representation.
343343
field = field.as_form_field()
344344

345-
if style.get('input_type') == 'datetime-local' and isinstance(field.value, str):
345+
if style.get('input_type') == 'datetime-local':
346346
# The format of an input type="datetime-local" is "yyyy-MM-ddThh:mm"
347347
# followed by optional ":ss" or ":ss.SSS", so keep only the first three
348348
# digits of milliseconds to avoid browser console error.
349-
datetime_parts = field.value.split(".")
350-
if len(datetime_parts) > 1:
351-
field.value = f"{datetime_parts[0]}.{datetime_parts[1][:3]}"
352-
else:
353-
field.value = field.value.rstrip('Z')
349+
datetime_value = field._field.parent.validated_data.get(field.field_name)
350+
field.value = datetime_value.replace(tzinfo=None).isoformat(timespec="milliseconds").rstrip('Z')
354351

355352
if 'template' in style:
356353
template_name = style['template']

tests/test_renderers.py

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@ class TestSerializer(serializers.Serializer):
489489
assert rendered == ''
490490

491491

492-
@override_settings(TIME_ZONE='UTC', USE_TZ=True)
493492
class TestDateTimeFieldHTMLFormRender(TestCase):
494493
def test_datetime_field_rendering_milliseconds(self):
495494
class TestSerializer(serializers.Serializer):
@@ -517,11 +516,11 @@ class TestSerializer(serializers.Serializer):
517516
field = serializer['appointment']
518517
rendered = renderer.render_field(field, {})
519518
self.assertInHTML(
520-
'<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:30">',
519+
'<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:30.000">',
521520
rendered
522521
)
523522

524-
def test_datetime_field_rendering_no_seconds_and_milliseconds(self):
523+
def test_datetime_field_rendering_no_seconds_and_no_milliseconds(self):
525524
class TestSerializer(serializers.Serializer):
526525
appointment = serializers.DateTimeField()
527526

@@ -532,7 +531,22 @@ class TestSerializer(serializers.Serializer):
532531
field = serializer['appointment']
533532
rendered = renderer.render_field(field, {})
534533
self.assertInHTML(
535-
'<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:00">',
534+
'<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:00.000">',
535+
rendered
536+
)
537+
538+
def test_datetime_field_rendering_with_format(self):
539+
class TestSerializer(serializers.Serializer):
540+
appointment = serializers.DateTimeField(format='%a %d %b %Y, %I:%M%p')
541+
542+
appointment = datetime(2024, 12, 24, 0, 55, 30, 345678)
543+
serializer = TestSerializer(data={"appointment": appointment})
544+
serializer.is_valid()
545+
renderer = HTMLFormRenderer()
546+
field = serializer['appointment']
547+
rendered = renderer.render_field(field, {})
548+
self.assertInHTML(
549+
'<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:30.345">',
536550
rendered
537551
)
538552

0 commit comments

Comments
 (0)