encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-26 03:23:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support empty file fields

Browse Source
This commit is contained in:
Tom Christie 2014-10-08 16:59:52 +01:00
parent 4c015df28c
commit 5ead8dc89d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/fields.py
View File

@ -913,6 +913,8 @@ class FileField(Field):
def to_representation(self, value): def to_representation(self, value):
if self.use_url: if self.use_url:
if not value:
return None
url = settings.MEDIA_URL + value.url url = settings.MEDIA_URL + value.url
request = self.context.get('request', None) request = self.context.get('request', None)
if request is not None: if request is not None:

3
tests/test_fields.py
View File

@ -879,7 +879,8 @@ class TestFileField(FieldValues):
(MockFile(name='x' * 100, size=10), ['Ensure this filename has at most 10 characters (it has 100).']) (MockFile(name='x' * 100, size=10), ['Ensure this filename has at most 10 characters (it has 100).'])
] ]
outputs = [ outputs = [
(MockFile(name='example.txt', url='/example.txt'), '/example.txt') (MockFile(name='example.txt', url='/example.txt'), '/example.txt'),
('', None)
] ]
field = fields.FileField(max_length=10) field = fields.FileField(max_length=10)