aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorTymur Maryokhin2014-11-06 18:20:55 +0100
committerTymur Maryokhin2014-11-06 18:20:55 +0100
commitea76dc18b6770aefcc53a6c5752674c2fff0ddcf (patch)
tree2e2b9f141d400160b115e0dd187d2a5e9c73fb95 /rest_framework/fields.py
parent4e001dbb7ac0bc13d6d5fbb4524e905184610aa2 (diff)
downloaddjango-rest-framework-ea76dc18b6770aefcc53a6c5752674c2fff0ddcf.tar.bz2
Fixed base_url duplication in FileField.use_url
Django already joins base_url when constructing FileField.url
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 71377326..95cda2ce 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -1007,7 +1007,7 @@ class FileField(Field):
if self.use_url:
if not value:
return None
- url = settings.MEDIA_URL + value.url
+ url = value.url
request = self.context.get('request', None)
if request is not None:
return request.build_absolute_uri(url)