Skip to content

Commit 01659c0

Browse files
Fixed #5363 -- HTML5 datetime-local valid format HTMLFormRenderer (#9365)
* Fixed #5363 -- HTML5 datetime-local valid format HTMLFormRenderer Co-authored-by: Peter Thomassen * Add condition to make code cleanable by pyupgrade --------- Co-authored-by: Bruno Alla <[email protected]>
1 parent ade172e commit 01659c0

File tree

2 files changed

+107
-4
lines changed

2 files changed

+107
-4
lines changed

rest_framework/renderers.py

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import base64
1111
import contextlib
1212
import datetime
13+
import sys
1314
from urllib import parse
1415

1516
from django import forms
@@ -22,7 +23,7 @@
2223
from django.utils.http import parse_header_parameters
2324
from django.utils.safestring import SafeString
2425

25-
from rest_framework import VERSION, exceptions, serializers, status
26+
from rest_framework import ISO_8601, VERSION, exceptions, serializers, status
2627
from rest_framework.compat import (
2728
INDENT_SEPARATORS, LONG_SEPARATORS, SHORT_SEPARATORS, coreapi, coreschema,
2829
pygments_css, yaml
@@ -339,11 +340,32 @@ def render_field(self, field, parent_style):
339340
style['template_pack'] = parent_style.get('template_pack', self.template_pack)
340341
style['renderer'] = self
341342

342-
# Get a clone of the field with text-only value representation.
343+
# Get a clone of the field with text-only value representation ('' if None or False).
343344
field = field.as_form_field()
344345

345-
if style.get('input_type') == 'datetime-local' and isinstance(field.value, str):
346-
field.value = field.value.rstrip('Z')
346+
if style.get('input_type') == 'datetime-local':
347+
try:
348+
format_ = field._field.format
349+
except AttributeError:
350+
format_ = api_settings.DATETIME_FORMAT
351+
352+
if format_ is not None:
353+
# field.value is expected to be a string
354+
# https://www.django-rest-framework.org/api-guide/fields/#datetimefield
355+
field_value = field.value
356+
if format_ == ISO_8601 and sys.version_info < (3, 11):
357+
# We can drop this branch once we drop support for Python < 3.11
358+
# https://docs.python.org/3/whatsnew/3.11.html#datetime
359+
field_value = field_value.rstrip('Z')
360+
field.value = (
361+
datetime.datetime.fromisoformat(field_value) if format_ == ISO_8601
362+
else datetime.datetime.strptime(field_value, format_)
363+
)
364+
365+
# The format of an input type="datetime-local" is "yyyy-MM-ddThh:mm"
366+
# followed by optional ":ss" or ":ss.SSS", so keep only the first three
367+
# digits of milliseconds to avoid browser console error.
368+
field.value = field.value.replace(tzinfo=None).isoformat(timespec="milliseconds")
347369

348370
if 'template' in style:
349371
template_name = style['template']

tests/test_renderers.py

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import re
22
from collections.abc import MutableMapping
3+
from datetime import datetime
4+
from zoneinfo import ZoneInfo
35

46
import pytest
57
from django.core.cache import cache
@@ -488,6 +490,85 @@ class TestSerializer(serializers.Serializer):
488490
assert rendered == ''
489491

490492

493+
class TestDateTimeFieldHTMLFormRender(TestCase):
494+
"""
495+
Default USE_TZ is True.
496+
Default TIME_ZONE is 'America/Chicago'.
497+
"""
498+
499+
def _assert_datetime_rendering(self, appointment, expected, datetimefield_kwargs=None):
500+
datetimefield_kwargs = datetimefield_kwargs or {}
501+
502+
class TestSerializer(serializers.Serializer):
503+
appointment = serializers.DateTimeField(**datetimefield_kwargs)
504+
505+
serializer = TestSerializer(data={"appointment": appointment})
506+
serializer.is_valid()
507+
renderer = HTMLFormRenderer()
508+
field = serializer['appointment']
509+
rendered = renderer.render_field(field, {})
510+
expected_html = (
511+
'<input name="appointment" class="form-control" '
512+
f'type="datetime-local" value="{expected}">'
513+
)
514+
515+
self.assertInHTML(expected_html, rendered)
516+
517+
def test_datetime_field_rendering_milliseconds(self):
518+
self._assert_datetime_rendering(
519+
datetime(2024, 12, 24, 0, 55, 30, 345678), "2024-12-24T00:55:30.345"
520+
)
521+
522+
def test_datetime_field_rendering_no_seconds_and_no_milliseconds(self):
523+
self._assert_datetime_rendering(
524+
datetime(2024, 12, 24, 0, 55, 0, 0), "2024-12-24T00:55:00.000"
525+
)
526+
527+
def test_datetime_field_rendering_with_format_as_none(self):
528+
self._assert_datetime_rendering(
529+
datetime(2024, 12, 24, 0, 55, 30, 345678),
530+
"2024-12-24T00:55:30.345",
531+
{"format": None}
532+
)
533+
534+
def test_datetime_field_rendering_with_format(self):
535+
self._assert_datetime_rendering(
536+
datetime(2024, 12, 24, 0, 55, 30, 345678),
537+
"2024-12-24T00:55:00.000",
538+
{"format": "%a %d %b %Y, %I:%M%p"}
539+
)
540+
541+
# New project templates default to 'UTC'.
542+
@override_settings(TIME_ZONE='UTC')
543+
def test_datetime_field_rendering_utc(self):
544+
self._assert_datetime_rendering(
545+
datetime(2024, 12, 24, 0, 55, 30, 345678),
546+
"2024-12-24T00:55:30.345"
547+
)
548+
549+
@override_settings(REST_FRAMEWORK={'DATETIME_FORMAT': '%a %d %b %Y, %I:%M%p'})
550+
def test_datetime_field_rendering_with_custom_datetime_format(self):
551+
self._assert_datetime_rendering(
552+
datetime(2024, 12, 24, 0, 55, 30, 345678),
553+
"2024-12-24T00:55:00.000"
554+
)
555+
556+
@override_settings(REST_FRAMEWORK={'DATETIME_FORMAT': None})
557+
def test_datetime_field_rendering_datetime_format_is_none(self):
558+
self._assert_datetime_rendering(
559+
datetime(2024, 12, 24, 0, 55, 30, 345678),
560+
"2024-12-24T00:55:30.345"
561+
)
562+
563+
# Enforce it in True because in Django versions under 4.2 was False by default.
564+
@override_settings(USE_TZ=True)
565+
def test_datetime_field_rendering_timezone_aware_datetime(self):
566+
self._assert_datetime_rendering(
567+
datetime(2024, 12, 24, 0, 55, 30, 345678, tzinfo=ZoneInfo('Asia/Tokyo')), # +09:00
568+
"2024-12-23T09:55:30.345" # Rendered in -06:00
569+
)
570+
571+
491572
class TestHTMLFormRenderer(TestCase):
492573
def setUp(self):
493574
class TestSerializer(serializers.Serializer):

0 commit comments

Comments
 (0)