aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-12-24 14:44:32 +0000
committerTom Christie2014-12-24 14:44:32 +0000
commit9f9b9f89441d512f13178fc1d56e9a3cd0908dea (patch)
tree7c80e361e8e33cba971e454645e4ea9b02c9be9c
parente6041f9c3e34a5dc83ff2b574b7625ccbd93ed38 (diff)
parentb32ecdefbace063c5b9b465af608ac6404795dd4 (diff)
downloaddjango-rest-framework-9f9b9f89441d512f13178fc1d56e9a3cd0908dea.tar.bz2
Merge pull request #2340 from shtouff/fix-htmlform-textarea
Use textarea input for 'models.TextField'.
-rw-r--r--rest_framework/utils/field_mapping.py2
-rw-r--r--tests/test_model_serializer.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py
index fca97b4b..b16e9df0 100644
--- a/rest_framework/utils/field_mapping.py
+++ b/rest_framework/utils/field_mapping.py
@@ -80,7 +80,7 @@ def get_field_kwargs(field_name, model_field):
kwargs['decimal_places'] = decimal_places
if isinstance(model_field, models.TextField):
- kwargs['style'] = {'type': 'textarea'}
+ kwargs['style'] = {'base_template': 'textarea.html'}
if isinstance(model_field, models.AutoField) or not model_field.editable:
# If this field is read-only, then return early.
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index da79164a..ee556dbc 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -119,7 +119,7 @@ class TestRegularFieldMappings(TestCase):
positive_small_integer_field = IntegerField()
slug_field = SlugField(max_length=100)
small_integer_field = IntegerField()
- text_field = CharField(style={'type': 'textarea'})
+ text_field = CharField(style={'base_template': 'textarea.html'})
time_field = TimeField()
url_field = URLField(max_length=100)
custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>)