encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-23 14:40:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2e6e802a94 into 0fc5a49a11

Browse Source
This commit is contained in:
Andrea de Marco 2012-09-10 09:27:28 -07:00
commit ddddd0468b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
djangorestframework/templates/djangorestframework/base.html
View File

@ -87,7 +87,7 @@
<h2>POST {{ name }}</h2>
{% csrf_token %}
{{ post_form.non_field_errors }}
{% for field in post_form %}
{% for field in post_form.visible_fields %}
<div class='form-row'>
{{ field.label_tag }}
{{ field }}
@ -109,7 +109,7 @@
<input type="hidden" name="{{ METHOD_PARAM }}" value="PUT" />
{% csrf_token %}
{{ put_form.non_field_errors }}
{% for field in put_form %}
{% for field in put_form.visible_fields %}
<div class='form-row'>
{{ field.label_tag }}
{{ field }}

2
djangorestframework/tests/renderers.py
View File

@ -71,7 +71,7 @@ urlpatterns = patterns('',
url(r'^$', MockView.as_view(renderers=[RendererA, RendererB])),
url(r'^jsonp/jsonrenderer$', MockGETView.as_view(renderers=[JSONRenderer, 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'^api', include('djangorestframework.urls', namespace='djangorestframework'))
)

3
djangorestframework/views.py
View File

@ -256,7 +256,8 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView):
if form is not None:
field_name_types = {}
for name, field in form.fields.iteritems():
field_name_types[name] = field.__class__.__name__
if not field.widget.is_hidden:
field_name_types[name] = field.__class__.__name__
response_obj['fields'] = field_name_types
# Note 'ErrorResponse' is misleading, it's just any response
# that should be rendered and returned immediately, without any