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

Merge pull request #5186 from dryice/max_length_for_file_field

Browse Source 
make sure max_length is in FileField kwargs
This commit is contained in:
Xavier Ordoquy 2017-05-29 07:54:13 +00:00 committed by GitHub
commit 6c7a7ccb1c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/utils/field_mapping.py
View File

@ -192,7 +192,8 @@ def get_field_kwargs(field_name, model_field):
# 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) or if max_length is not None and (isinstance(model_field, models.CharField) or
isinstance(model_field, models.TextField)): isinstance(model_field, models.TextField) or
isinstance(model_field, models.FileField)):
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

2
tests/test_model_serializer.py
View File

@ -63,6 +63,7 @@ class RegularFieldsModel(models.Model):
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(max_length=100) text_field = models.TextField(max_length=100)
file_field = models.FileField(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()
@ -181,6 +182,7 @@ class TestRegularFieldMappings(TestCase):
slug_field = SlugField(max_length=100) slug_field = SlugField(max_length=100)
small_integer_field = IntegerField() small_integer_field = IntegerField()
text_field = CharField(max_length=100, style={'base_template': 'textarea.html'}) text_field = CharField(max_length=100, style={'base_template': 'textarea.html'})
file_field = FileField(max_length=100)
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>)