diff --git a/rest_framework/metadata.py b/rest_framework/metadata.py index 6c4f176923..2d99f61cbd 100644 --- a/rest_framework/metadata.py +++ b/rest_framework/metadata.py @@ -15,6 +15,7 @@ from django.utils.encoding import force_text from rest_framework import exceptions, serializers +from rest_framework.fields import empty from rest_framework.request import clone_request from rest_framework.utils.field_mapping import ClassLookupDict @@ -123,13 +124,16 @@ def get_field_info(self, field): attrs = [ 'read_only', 'label', 'help_text', - 'min_length', 'max_length', + 'min_length', 'max_length', 'default', 'min_value', 'max_value' ] for attr in attrs: value = getattr(field, attr, None) - if value is not None and value != '': + if value is not None and value != '' and value != empty: + if callable(value): + value.set_context(field) + value = value() field_info[attr] = force_text(value, strings_only=True) if getattr(field, 'child', None): diff --git a/tests/test_metadata.py b/tests/test_metadata.py index 6819f15046..f820d7ea86 100644 --- a/tests/test_metadata.py +++ b/tests/test_metadata.py @@ -69,7 +69,7 @@ class ExampleSerializer(serializers.Serializer): min_value=1, max_value=1000 ) 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( child=serializers.ListField( @@ -77,6 +77,7 @@ class ExampleSerializer(serializers.Serializer): ) ) nested_field = NestedField() + defaultuser_field = serializers.HiddenField(default=serializers.CurrentUserDefault()) class ExampleView(views.APIView): """Example view.""" @@ -84,7 +85,10 @@ def post(self, request): pass def get_serializer(self): - return ExampleSerializer() + if self.request: + return ExampleSerializer(context={'request': self.request}) + else: + return ExampleSerializer() view = ExampleView.as_view() response = view(request=request) @@ -128,7 +132,8 @@ def get_serializer(self): 'read_only': False, 'label': 'Char field', 'min_length': 3, - 'max_length': 40 + 'max_length': 40, + 'default': 'Cookie' }, 'list_field': { 'type': 'list', @@ -165,6 +170,13 @@ def get_serializer(self): 'label': 'B' } } + }, + 'defaultuser_field': { + 'type': 'field', + 'required': False, + 'read_only': False, + 'label': 'Defaultuser field', + 'default': 'AnonymousUser' } } }