aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorTom Christie2014-09-29 14:12:26 +0100
committerTom Christie2014-09-29 14:12:26 +0100
commitd1b2c8ac7faec65483cbddf4f1718ca4f5805246 (patch)
tree0d21bed990076e124502d2c4a54138faf5e5c072 /rest_framework/fields.py
parent657d1de032bfa392609d53751e89366b972cd678 (diff)
downloaddjango-rest-framework-d1b2c8ac7faec65483cbddf4f1718ca4f5805246.tar.bz2
Absolute URLs for file fields
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index fee6080a..f7ea3b0c 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -150,10 +150,6 @@ class Field(object):
messages.update(error_messages or {})
self.error_messages = messages
- for validator in validators:
- if getattr(validator, 'requires_context', False):
- validator.serializer_field = self
-
def bind(self, field_name, parent):
"""
Initializes the field name and parent for the field instance.
@@ -264,6 +260,8 @@ class Field(object):
"""
errors = []
for validator in self.validators:
+ if getattr(validator, 'requires_context', False):
+ validator.serializer_field = self
try:
validator(value)
except ValidationError as exc:
@@ -907,7 +905,11 @@ class FileField(Field):
def to_representation(self, value):
if self.use_url:
- return settings.MEDIA_URL + value.url
+ url = settings.MEDIA_URL + value.url
+ request = self.context.get('request', None)
+ if request is not None:
+ return request.build_absolute_uri(url)
+ return url
return value.name