Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Map all supported FilePathField options
  • Loading branch information
jpadilla committed Oct 23, 2015
commit d64bfef56af2d098770c2216770c311a06e03127
15 changes: 15 additions & 0 deletions rest_framework/utils/field_mapping.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,21 @@ def get_field_kwargs(field_name, model_field):
isinstance(model_field, models.TextField)):
kwargs['allow_blank'] = True

if isinstance(model_field, models.FilePathField):
kwargs['path'] = model_field.path

if model_field.match is not None:
kwargs['match'] = model_field.match

if model_field.recursive is not False:
kwargs['recursive'] = model_field.recursive

if model_field.allow_files is not True:
kwargs['allow_files'] = model_field.allow_files

if model_field.allow_folders is not False:
kwargs['allow_folders'] = model_field.allow_folders

if model_field.choices:
# If this model field contains choices, then return early.
# Further keyword arguments are not valid.
Expand Down
2 changes: 2 additions & 0 deletions tests/test_model_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class RegularFieldsModel(models.Model):
time_field = models.TimeField()
url_field = models.URLField(max_length=100)
custom_field = CustomField()
file_path_field = models.FilePathField(path='/tmp/')

def method(self):
return 'method'
Expand Down Expand Up @@ -165,6 +166,7 @@ class Meta:
time_field = TimeField()
url_field = URLField(max_length=100)
custom_field = ModelField(model_field=<tests.test_model_serializer.CustomField: custom_field>)
file_path_field = FilePathField(path='/tmp/')
""")

self.assertEqual(unicode_repr(TestSerializer()), expected)
Expand Down