Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
6c7a7ccb
Commit
6c7a7ccb
authored
May 29, 2017
by
Xavier Ordoquy
Committed by
GitHub
May 29, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5186 from dryice/max_length_for_file_field
make sure max_length is in FileField kwargs
parents
26623436
83632859
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
rest_framework/utils/field_mapping.py
+2
-1
tests/test_model_serializer.py
+2
-0
No files found.
rest_framework/utils/field_mapping.py
View file @
6c7a7ccb
...
...
@@ -192,7 +192,8 @@ def get_field_kwargs(field_name, model_field):
# rather than as a validator.
max_length
=
getattr
(
model_field
,
'max_length'
,
None
)
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
validator_kwarg
=
[
validator
for
validator
in
validator_kwarg
...
...
tests/test_model_serializer.py
View file @
6c7a7ccb
...
...
@@ -63,6 +63,7 @@ class RegularFieldsModel(models.Model):
slug_field
=
models
.
SlugField
(
max_length
=
100
)
small_integer_field
=
models
.
SmallIntegerField
()
text_field
=
models
.
TextField
(
max_length
=
100
)
file_field
=
models
.
FileField
(
max_length
=
100
)
time_field
=
models
.
TimeField
()
url_field
=
models
.
URLField
(
max_length
=
100
)
custom_field
=
CustomField
()
...
...
@@ -181,6 +182,7 @@ class TestRegularFieldMappings(TestCase):
slug_field = SlugField(max_length=100)
small_integer_field = IntegerField()
text_field = CharField(max_length=100, style={'base_template': 'textarea.html'})
file_field = FileField(max_length=100)
time_field = TimeField()
url_field = URLField(max_length=100)
custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment