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

Integrated status quo of grimborg's awesome humanize_field() for exposing field metadata via OPTIONS :)

Browse Source
This commit is contained in:
Nikolaus Schlemm 2013-05-19 09:25:02 +02:00
parent 9454e23aa9
commit c0f3a1c397
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/fields.py
View File

@ -136,7 +136,7 @@ def humanize_field(field):
humanized = { humanized = {
'type': humanize_field_type(field.__class__), 'type': humanize_field_type(field.__class__),
'required': getattr(field, 'required', False), 'required': getattr(field, 'required', False),
'label': field.label, 'label': getattr(field, 'label', None),
} }
optional_attrs = ['read_only', 'help_text'] optional_attrs = ['read_only', 'help_text']
for attr in optional_attrs: for attr in optional_attrs:

36
rest_framework/tests/generics.py
View File

@ -128,18 +128,18 @@ class TestRootView(TestCase):
for method in ('GET', 'POST',): for method in ('GET', 'POST',):
expected['actions'][method] = { expected['actions'][method] = {
'text': { 'text': {
'description': '', #'description': '',
'label': '', 'label': None,
'readonly': False, 'read_only': False,
'required': True, 'required': True,
'type': 'CharField', 'type': 'Single Character',
}, },
'id': { 'id': {
'description': '', #'description': '',
'label': '', 'label': None,
'readonly': True, 'read_only': True,
'required': True, 'required': False,
'type': 'IntegerField', 'type': 'Integer',
}, },
} }
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
@ -264,18 +264,18 @@ class TestInstanceView(TestCase):
for method in ('GET', 'PATCH', 'PUT', 'DELETE'): for method in ('GET', 'PATCH', 'PUT', 'DELETE'):
expected['actions'][method] = { expected['actions'][method] = {
'text': { 'text': {
'description': '', #'description': '',
'label': '', 'label': None,
'readonly': False, 'read_only': False,
'required': True, 'required': True,
'type': 'CharField', 'type': 'Single Character',
}, },
'id': { 'id': {
'description': '', #'description': '',
'label': '', 'label': None,
'readonly': True, 'read_only': True,
'required': True, 'required': False,
'type': 'IntegerField', 'type': 'Integer',
}, },
} }
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)

3
rest_framework/views.py
View File

@ -85,8 +85,7 @@ class APIView(View):
field_name_types = {} field_name_types = {}
for name, field in serializer.fields.iteritems(): for name, field in serializer.fields.iteritems():
from rest_framework.fields import humanize_field from rest_framework.fields import humanize_field
humanize_field(field) field_name_types[name] = humanize_field(field)
field_name_types[name] = field.__class__.__name__
actions[method] = field_name_types actions[method] = field_name_types
except exceptions.PermissionDenied: except exceptions.PermissionDenied: