From 1343398868937ed1e401054a8490bcea57d649d7 Mon Sep 17 00:00:00 2001
From: Markus Törnqvist
Date: Sat, 18 May 2013 15:15:02 +0300
Subject: Renderer uses form field's label and help, not attribute name

---
 rest_framework/renderers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rest_framework/renderers.py')

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 8361cd40..a58025cd 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -366,7 +366,8 @@ class BrowsableAPIRenderer(BaseRenderer):
             if getattr(v, 'default', None) is not None:
                 kwargs['initial'] = v.default
 
-            kwargs['label'] = k
+            kwargs['label'] = v.label
+            kwargs['help_text'] = v.help_text
 
             fields[k] = v.form_field_class(**kwargs)
 
-- 
cgit v1.2.3


From e7ddaf5472ba3746da2a0e9dfed6326fc90ce08e Mon Sep 17 00:00:00 2001
From: Markus Törnqvist
Date: Sat, 18 May 2013 16:50:59 +0300
Subject: Turns out label and help_text are not always there

---
 rest_framework/renderers.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'rest_framework/renderers.py')

diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index a58025cd..2b56d6e4 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -366,8 +366,11 @@ class BrowsableAPIRenderer(BaseRenderer):
             if getattr(v, 'default', None) is not None:
                 kwargs['initial'] = v.default
 
-            kwargs['label'] = v.label
-            kwargs['help_text'] = v.help_text
+            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)
 
-- 
cgit v1.2.3