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

Merge 068f990c80 into bd768d6253

Browse Source
This commit is contained in:
Uğur Ünver 2017-04-18 11:52:49 +00:00 committed by GitHub
commit 4f223351a0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rest_framework/metadata.py
View File

@ -52,6 +52,7 @@ class SimpleMetadata(BaseMetadata):
serializers.TimeField: 'time', serializers.TimeField: 'time',
serializers.ChoiceField: 'choice', serializers.ChoiceField: 'choice',
serializers.MultipleChoiceField: 'multiple choice', serializers.MultipleChoiceField: 'multiple choice',
serializers.ManyRelatedField: 'multiple choice',
serializers.FileField: 'file upload', serializers.FileField: 'file upload',
serializers.ImageField: 'image upload', serializers.ImageField: 'image upload',
serializers.ListField: 'list', serializers.ListField: 'list',

2
tests/test_metadata.py
View File

@ -352,7 +352,7 @@ class TestModelSerializerMetadata(TestCase):
'label': 'ID' 'label': 'ID'
}, },
'children': { 'children': {
'type': 'field', 'type': 'multiple choice',
'required': False, 'required': False,
'read_only': True, 'read_only': True,
'label': 'Children' 'label': 'Children'