encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 12:30:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge c57d80d2a0 into 48b66ec2a2

Browse Source
This commit is contained in:
Mihail Burduja 2014-08-18 21:10:00 +00:00
commit 363c547e40
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/fields.py
View File

@ -973,6 +973,8 @@ class FileField(WritableField):
return data return data
def to_native(self, value): def to_native(self, value):
if api_settings.PREPEND_MEDIA_URL:
return settings.MEDIA_URL + value.name
return value.name return value.name

3
rest_framework/settings.py
View File

@ -119,6 +119,9 @@ DEFAULTS = {
# Pending deprecation # Pending deprecation
'FILTER_BACKEND': None, 'FILTER_BACKEND': None,
# Prepending MEDIA_URL to FileField
'PREPEND_MEDIA_URL': False,
} }