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

Add 'default' value in metadatas

Browse Source
This commit is contained in:
Johan Charpentier 2015-12-24 12:56:58 +01:00
parent 2d27d9a10a
commit 4c3071b97f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/metadata.py
View File

@ -15,6 +15,7 @@ from django.http import Http404
from django.utils.encoding import force_text from django.utils.encoding import force_text
from rest_framework import exceptions, serializers from rest_framework import exceptions, serializers
from rest_framework.fields import empty
from rest_framework.request import clone_request from rest_framework.request import clone_request
from rest_framework.utils.field_mapping import ClassLookupDict from rest_framework.utils.field_mapping import ClassLookupDict
@ -123,13 +124,13 @@ class SimpleMetadata(BaseMetadata):
attrs = [ attrs = [
'read_only', 'label', 'help_text', 'read_only', 'label', 'help_text',
'min_length', 'max_length', 'min_length', 'max_length', 'default',
'min_value', 'max_value' 'min_value', 'max_value'
] ]
for attr in attrs: for attr in attrs:
value = getattr(field, attr, None) value = getattr(field, attr, None)
if value is not None and value != '': if value is not None and value != '' and value != empty:
field_info[attr] = force_text(value, strings_only=True) field_info[attr] = force_text(value, strings_only=True)
if getattr(field, 'child', None): if getattr(field, 'child', None):

5
tests/test_metadata.py
View File

@ -69,7 +69,7 @@ class TestMetadata:
min_value=1, max_value=1000 min_value=1, max_value=1000
) )
char_field = serializers.CharField( char_field = serializers.CharField(
required=False, min_length=3, max_length=40 required=False, min_length=3, max_length=40, default='Cookie'
) )
list_field = serializers.ListField( list_field = serializers.ListField(
child=serializers.ListField( child=serializers.ListField(
@ -128,7 +128,8 @@ class TestMetadata:
'read_only': False, 'read_only': False,
'label': 'Char field', 'label': 'Char field',
'min_length': 3, 'min_length': 3,
'max_length': 40 'max_length': 40,
'default': 'Cookie'
}, },
'list_field': { 'list_field': {
'type': 'list', 'type': 'list',