encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 21:44:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Issue-140-master' into related-serializers

Browse Source
This commit is contained in:
Sean C. Farley 2012-06-26 19:13:05 -04:00
commit 4de3708a61
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
djangorestframework/renderers.py
View File

@ -244,16 +244,20 @@ class DocumentingTemplateRenderer(BaseRenderer):
except Exception: except Exception:
form_instance = None form_instance = None
# If we still don't have a form instance then try to get an unbound form # Forms for the GET method must be explicit, so do not get an unbound
if not form_instance: # form nor create a generic form for this instance.
try: if method != 'get':
form_instance = view.get_bound_form(method=method) # If we still don't have a form instance then try to get an unbound form
except Exception: if not form_instance:
pass try:
form_instance = view.get_bound_form(method=method)
except Exception:
pass
# If we still don't have a form instance then try to get an unbound form which can tunnel arbitrary content types # If we still don't have a form instance then try to get an unbound form
if not form_instance: # which can tunnel arbitrary content types.
form_instance = self._get_generic_content_form(view) if not form_instance:
form_instance = self._get_generic_content_form(view)
return form_instance return form_instance
@ -316,6 +320,7 @@ class DocumentingTemplateRenderer(BaseRenderer):
content = self._get_content(self.view, self.view.request, obj, media_type) content = self._get_content(self.view, self.view.request, obj, media_type)
get_form_instance = self._get_form_instance(self.view, 'get')
put_form_instance = self._get_form_instance(self.view, 'put') put_form_instance = self._get_form_instance(self.view, 'put')
post_form_instance = self._get_form_instance(self.view, 'post') post_form_instance = self._get_form_instance(self.view, 'post')
@ -342,6 +347,7 @@ class DocumentingTemplateRenderer(BaseRenderer):
'version': VERSION, 'version': VERSION,
'breadcrumblist': breadcrumb_list, 'breadcrumblist': breadcrumb_list,
'available_formats': self.view._rendered_formats, 'available_formats': self.view._rendered_formats,
'get_form': get_form_instance,
'put_form': put_form_instance, 'put_form': put_form_instance,
'post_form': post_form_instance, 'post_form': post_form_instance,
'FORMAT_PARAM': self._FORMAT_QUERY_PARAM, 'FORMAT_PARAM': self._FORMAT_QUERY_PARAM,

10
djangorestframework/resources.py
View File

@ -182,15 +182,19 @@ class FormResource(Resource):
""" """
Returns the form class used to validate this resource. Returns the form class used to validate this resource.
""" """
# A form on the view overrides a form on the resource.
form = getattr(self.view, 'form', None) or self.form
# Use the requested method or determine the request method # Use the requested method or determine the request method
if method is None and hasattr(self.view, 'request') and hasattr(self.view, 'method'): if method is None and hasattr(self.view, 'request') and hasattr(self.view, 'method'):
method = self.view.method method = self.view.method
elif method is None and hasattr(self.view, 'request'): elif method is None and hasattr(self.view, 'request'):
method = self.view.request.method method = self.view.request.method
# A form on the view overrides a form on the resource. The GET method
# must have its form explicity set (e.g., get_form).
if not method or method.lower() != 'get':
form = getattr(self.view, 'form', None) or self.form
else:
form = None
# A method form on the view or resource overrides the general case. # A method form on the view or resource overrides the general case.
# Method forms are attributes like `get_form` `post_form` `put_form`. # Method forms are attributes like `get_form` `post_form` `put_form`.
if method: if method: