Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rest_framework/utils/serializer_helpers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from collections import OrderedDict
from collections.abc import MutableMapping
from collections.abc import Mapping, MutableMapping

from django.utils.encoding import force_str

Expand Down Expand Up @@ -101,7 +101,7 @@ class NestedBoundField(BoundField):
"""

def __init__(self, field, value, errors, prefix=''):
if value is None or value == '':
if value is None or value == '' or not isinstance(value, Mapping):
value = {}
super().__init__(field, value, errors, prefix)

Expand Down
27 changes: 27 additions & 0 deletions tests/test_bound_fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,33 @@ class ExampleSerializer(serializers.Serializer):
rendered_packed = ''.join(rendered.split())
assert rendered_packed == expected_packed

def test_rendering_nested_fields_with_not_mappable_value(self):
from rest_framework.renderers import HTMLFormRenderer

class Nested(serializers.Serializer):
text_field = serializers.CharField()

class ExampleSerializer(serializers.Serializer):
nested = Nested()

serializer = ExampleSerializer(data={'nested': 1})
assert not serializer.is_valid()
renderer = HTMLFormRenderer()
for field in serializer:
rendered = renderer.render_field(field, {})
expected_packed = (
'<fieldset>'
'<legend>Nested</legend>'
'<divclass="form-group">'
'<label>Textfield</label>'
'<inputname="nested.text_field"class="form-control"type="text"value="">'
'</div>'
'</fieldset>'
)

rendered_packed = ''.join(rendered.split())
assert rendered_packed == expected_packed


class TestJSONBoundField:
def test_as_form_fields(self):
Expand Down