mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-26 16:09:49 +03:00
Merge 2e6e802a94
into 0fc5a49a11
This commit is contained in:
commit
ddddd0468b
|
@ -87,7 +87,7 @@
|
||||||
<h2>POST {{ name }}</h2>
|
<h2>POST {{ name }}</h2>
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ post_form.non_field_errors }}
|
{{ post_form.non_field_errors }}
|
||||||
{% for field in post_form %}
|
{% for field in post_form.visible_fields %}
|
||||||
<div class='form-row'>
|
<div class='form-row'>
|
||||||
{{ field.label_tag }}
|
{{ field.label_tag }}
|
||||||
{{ field }}
|
{{ field }}
|
||||||
|
@ -109,7 +109,7 @@
|
||||||
<input type="hidden" name="{{ METHOD_PARAM }}" value="PUT" />
|
<input type="hidden" name="{{ METHOD_PARAM }}" value="PUT" />
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ put_form.non_field_errors }}
|
{{ put_form.non_field_errors }}
|
||||||
{% for field in put_form %}
|
{% for field in put_form.visible_fields %}
|
||||||
<div class='form-row'>
|
<div class='form-row'>
|
||||||
{{ field.label_tag }}
|
{{ field.label_tag }}
|
||||||
{{ field }}
|
{{ field }}
|
||||||
|
|
|
@ -71,7 +71,7 @@ urlpatterns = patterns('',
|
||||||
url(r'^$', MockView.as_view(renderers=[RendererA, RendererB])),
|
url(r'^$', MockView.as_view(renderers=[RendererA, RendererB])),
|
||||||
url(r'^jsonp/jsonrenderer$', MockGETView.as_view(renderers=[JSONRenderer, JSONPRenderer])),
|
url(r'^jsonp/jsonrenderer$', MockGETView.as_view(renderers=[JSONRenderer, JSONPRenderer])),
|
||||||
url(r'^jsonp/nojsonrenderer$', MockGETView.as_view(renderers=[JSONPRenderer])),
|
url(r'^jsonp/nojsonrenderer$', MockGETView.as_view(renderers=[JSONPRenderer])),
|
||||||
url(r'^html$', HTMLView.as_view()),
|
url(r'^html$', HTMLView.as_view(),root='home'),
|
||||||
url(r'^html1$', HTMLView1.as_view()),
|
url(r'^html1$', HTMLView1.as_view()),
|
||||||
url(r'^api', include('djangorestframework.urls', namespace='djangorestframework'))
|
url(r'^api', include('djangorestframework.urls', namespace='djangorestframework'))
|
||||||
)
|
)
|
||||||
|
|
|
@ -256,6 +256,7 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView):
|
||||||
if form is not None:
|
if form is not None:
|
||||||
field_name_types = {}
|
field_name_types = {}
|
||||||
for name, field in form.fields.iteritems():
|
for name, field in form.fields.iteritems():
|
||||||
|
if not field.widget.is_hidden:
|
||||||
field_name_types[name] = field.__class__.__name__
|
field_name_types[name] = field.__class__.__name__
|
||||||
response_obj['fields'] = field_name_types
|
response_obj['fields'] = field_name_types
|
||||||
# Note 'ErrorResponse' is misleading, it's just any response
|
# Note 'ErrorResponse' is misleading, it's just any response
|
||||||
|
|
Loading…
Reference in New Issue
Block a user