diff options
| author | Tom Christie | 2013-05-21 12:01:56 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-05-21 12:01:56 +0100 |
| commit | cdc3c374656ed5c2f620e6aa8bd21b4f05de3f27 (patch) | |
| tree | 06039d1d96601277972c5822340bdbad8d985a09 /rest_framework/serializers.py | |
| parent | f77ae156f963ee01318ad0548e426c8a105bb934 (diff) | |
| parent | 99848b0321a07d7f05f2333f635756f45e058088 (diff) | |
| download | django-rest-framework-cdc3c374656ed5c2f620e6aa8bd21b4f05de3f27.tar.bz2 | |
Merge and styling fixes
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 943fba6b..31f261e1 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -739,6 +739,12 @@ class ModelSerializer(Serializer): if issubclass(model_field.__class__, models.TextField): kwargs['widget'] = widgets.Textarea + if model_field.verbose_name is not None: + kwargs['label'] = model_field.verbose_name + + if model_field.help_text is not None: + kwargs['help_text'] = model_field.help_text + # TODO: TypedChoiceField? if model_field.flatchoices: # This ModelField contains choices kwargs['choices'] = model_field.flatchoices |