encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-09-16 09:12:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Apply changes requested by peterthomassen

Browse Source
This commit is contained in:
Marcelo Galigniana 2025-08-17 17:54:02 -03:00
parent 85ca28225b
commit b39982be73
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/renderers.py
View File

@ -347,7 +347,10 @@ class HTMLFormRenderer(BaseRenderer):
# followed by optional ":ss" or ":ss.SSS", so keep only the first three # followed by optional ":ss" or ":ss.SSS", so keep only the first three
# digits of milliseconds to avoid browser console error. # digits of milliseconds to avoid browser console error.
datetime_parts = field.value.split(".") datetime_parts = field.value.split(".")
if len(datetime_parts) > 1:
field.value = f"{datetime_parts[0]}.{datetime_parts[1][:3]}" field.value = f"{datetime_parts[0]}.{datetime_parts[1][:3]}"
else:
field.value = field.value.rstrip('Z')
if 'template' in style: if 'template' in style:
template_name = style['template'] template_name = style['template']

33
tests/test_renderers.py
View File

@ -489,8 +489,9 @@ class TestHiddenFieldHTMLFormRenderer(TestCase):
assert rendered == '' assert rendered == ''
@override_settings(TIME_ZONE='UTC', USE_TZ=True)
class TestDateTimeFieldHTMLFormRender(TestCase): class TestDateTimeFieldHTMLFormRender(TestCase):
def test_datetime_field_rendering(self): def test_datetime_field_rendering_milliseconds(self):
class TestSerializer(serializers.Serializer): class TestSerializer(serializers.Serializer):
appointment = serializers.DateTimeField() appointment = serializers.DateTimeField()
@ -505,6 +506,36 @@ class TestDateTimeFieldHTMLFormRender(TestCase):
rendered rendered
) )
def test_datetime_field_rendering_no_milliseconds(self):
class TestSerializer(serializers.Serializer):
appointment = serializers.DateTimeField()
appointment = datetime(2024, 12, 24, 0, 55, 30, 0)
serializer = TestSerializer(data={"appointment": appointment})
serializer.is_valid()
renderer = HTMLFormRenderer()
field = serializer['appointment']
rendered = renderer.render_field(field, {})
self.assertInHTML(
'<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:30">',
rendered
)
def test_datetime_field_rendering_no_seconds_and_milliseconds(self):
class TestSerializer(serializers.Serializer):
appointment = serializers.DateTimeField()
appointment = datetime(2024, 12, 24, 0, 55, 0, 0)
serializer = TestSerializer(data={"appointment": appointment})
serializer.is_valid()
renderer = HTMLFormRenderer()
field = serializer['appointment']
rendered = renderer.render_field(field, {})
self.assertInHTML(
'<input name="appointment" class="form-control" type="datetime-local" value="2024-12-24T00:55:00">',
rendered
)
class TestHTMLFormRenderer(TestCase): class TestHTMLFormRenderer(TestCase):
def setUp(self): def setUp(self):