encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-03-06 20:36:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3509 from jpadilla/textfield-max-length

Browse Source 
Map TextField max_length to CharField
This commit is contained in:
Tom Christie 2015-10-16 12:31:26 +01:00
commit c94b354efa
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/utils/field_mapping.py
View File

@ -123,7 +123,8 @@ def get_field_kwargs(field_name, model_field):
# Ensure that max_length is passed explicitly as a keyword arg, # Ensure that max_length is passed explicitly as a keyword arg,
# rather than as a validator. # rather than as a validator.
max_length = getattr(model_field, 'max_length', None) max_length = getattr(model_field, 'max_length', None)
if max_length is not None and isinstance(model_field, models.CharField): if max_length is not None and (isinstance(model_field, models.CharField) or
isinstance(model_field, models.TextField)):
kwargs['max_length'] = max_length kwargs['max_length'] = max_length
validator_kwarg = [ validator_kwarg = [
validator for validator in validator_kwarg validator for validator in validator_kwarg

5
tests/test_model_serializer.py
View File

@ -63,7 +63,7 @@ class RegularFieldsModel(models.Model):
positive_small_integer_field = models.PositiveSmallIntegerField() positive_small_integer_field = models.PositiveSmallIntegerField()
slug_field = models.SlugField(max_length=100) slug_field = models.SlugField(max_length=100)
small_integer_field = models.SmallIntegerField() small_integer_field = models.SmallIntegerField()
text_field = models.TextField() text_field = models.TextField(max_length=100)
time_field = models.TimeField() time_field = models.TimeField()
url_field = models.URLField(max_length=100) url_field = models.URLField(max_length=100)
custom_field = CustomField() custom_field = CustomField()
@ -161,11 +161,12 @@ class TestRegularFieldMappings(TestCase):
positive_small_integer_field = IntegerField() positive_small_integer_field = IntegerField()
slug_field = SlugField(max_length=100) slug_field = SlugField(max_length=100)
small_integer_field = IntegerField() small_integer_field = IntegerField()
text_field = CharField(style={'base_template': 'textarea.html'}) text_field = CharField(max_length=100, style={'base_template': 'textarea.html'})
time_field = TimeField() time_field = TimeField()
url_field = URLField(max_length=100) url_field = URLField(max_length=100)
custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>) custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>)
""") """)
self.assertEqual(unicode_repr(TestSerializer()), expected) self.assertEqual(unicode_repr(TestSerializer()), expected)
def test_field_options(self): def test_field_options(self):