diff options
| author | Tom Christie | 2013-01-30 13:41:56 +0000 |
|---|---|---|
| committer | Tom Christie | 2013-01-30 13:41:56 +0000 |
| commit | be6df3ae3ce18bf4b55ae065ebd34198885e48df (patch) | |
| tree | 3a96bb6a5075584add7e28c6d8d7f251ad785b4e /rest_framework/renderers.py | |
| parent | 9a4d01d687d57601d37f9a930d37039cb9f6a6f2 (diff) | |
| parent | 8021bb5d5089955b171173e60dcc0968e13d29ea (diff) | |
| download | django-rest-framework-be6df3ae3ce18bf4b55ae065ebd34198885e48df.tar.bz2 | |
Merge branch 'master' into many-fields
Conflicts:
rest_framework/relations.py
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 1f6e615f..ed11551b 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -332,10 +332,7 @@ class BrowsableAPIRenderer(BaseRenderer): kwargs['label'] = k - if getattr(v, 'many', None): - fields[k] = v.many_form_field_class(**kwargs) - else: - fields[k] = v.form_field_class(**kwargs) + fields[k] = v.form_field_class(**kwargs) return fields |