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/renderers.py | |
| parent | f77ae156f963ee01318ad0548e426c8a105bb934 (diff) | |
| parent | 99848b0321a07d7f05f2333f635756f45e058088 (diff) | |
| download | django-rest-framework-cdc3c374656ed5c2f620e6aa8bd21b4f05de3f27.tar.bz2 | |
Merge and styling fixes
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index fd868346..b4fa55bd 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -385,7 +385,11 @@ class BrowsableAPIRenderer(BaseRenderer): if getattr(v, 'default', None) is not None: kwargs['initial'] = v.default - kwargs['label'] = k + if getattr(v, 'label', None) is not None: + kwargs['label'] = v.label + + if getattr(v, 'help_text', None) is not None: + kwargs['help_text'] = v.help_text fields[k] = v.form_field_class(**kwargs) |