Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retry form rendering when rendering with serializer fails. #3164

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 31 additions & 23 deletions rest_framework/renderers.py
Expand Up @@ -473,32 +473,40 @@ def get_rendered_html_form(self, data, view, method, request):
):
return

serializers = []
if existing_serializer is not None:
serializer = existing_serializer
serializers.append(existing_serializer)

if has_serializer:
if method in ('PUT', 'PATCH'):
serializers.append(view.get_serializer(instance=instance, **kwargs))
else:
serializers.append(view.get_serializer(**kwargs))
else:
if has_serializer:
if method in ('PUT', 'PATCH'):
serializer = view.get_serializer(instance=instance, **kwargs)
else:
serializer = view.get_serializer(**kwargs)
# at this point we must have a serializer_class
if method in ('PUT', 'PATCH'):
serializers.append(self._get_serializer(view.serializer_class, view,
request, instance=instance, **kwargs))
else:
# at this point we must have a serializer_class
if method in ('PUT', 'PATCH'):
serializer = self._get_serializer(view.serializer_class, view,
request, instance=instance, **kwargs)
else:
serializer = self._get_serializer(view.serializer_class, view,
request, **kwargs)

if hasattr(serializer, 'initial_data'):
serializer.is_valid()

form_renderer = self.form_renderer_class()
return form_renderer.render(
serializer.data,
self.accepted_media_type,
{'style': {'template_pack': 'rest_framework/horizontal'}}
)
serializers.append(self._get_serializer(view.serializer_class, view,
request, **kwargs))

for serializer in serializers:
try:
if hasattr(serializer, 'initial_data'):
serializer.is_valid()

form_renderer = self.form_renderer_class()
return form_renderer.render(
serializer.data,
self.accepted_media_type,
{'style': {'template_pack': 'rest_framework/horizontal'}}
)
except TypeError:
pass
# If none of the rendering attempts succeeded, raise the TypeError generated by the last
# attempt.
raise

def get_raw_data_form(self, data, view, method, request):
"""
Expand Down
37 changes: 37 additions & 0 deletions tests/test_generics.py
Expand Up @@ -64,6 +64,16 @@ class FKInstanceView(generics.RetrieveUpdateDestroyAPIView):
serializer_class = ForeignKeySerializer


class ManyPostView(generics.GenericAPIView):
queryset = BasicModel.objects.all()
serializer_class = BasicSerializer
renderer_classes = (renderers.BrowsableAPIRenderer, renderers.JSONRenderer)

def post(self, request, *args, **kwargs):
serializer = self.get_serializer(self.get_queryset(), many=True)
return Response(serializer.data, status.HTTP_200_OK)


class SlugBasedInstanceView(InstanceView):
"""
A model with a slug-field.
Expand Down Expand Up @@ -542,3 +552,30 @@ def get(self, request):
request = factory.get('/')
with pytest.raises(RuntimeError):
view(request).render()


class TestManyPostView(TestCase):
def setUp(self):
"""
Create 3 BasicModel instances.
"""
items = ['foo', 'bar', 'baz']
for item in items:
BasicModel(text=item).save()
self.objects = BasicModel.objects
self.data = [
{'id': obj.id, 'text': obj.text}
for obj in self.objects.all()
]
self.view = ManyPostView.as_view()

def test_post_many_post_view(self):
"""
POST request to ManyPostView should return a list of objects.
"""
data = {}
request = factory.post('/', data, format='json')
with self.assertNumQueries(1):
response = self.view(request).render()
self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data), 3)