Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
d1b2c8ac
Commit
d1b2c8ac
authored
Sep 29, 2014
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Absolute URLs for file fields
parent
657d1de0
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
7 deletions
+24
-7
rest_framework/fields.py
+7
-5
rest_framework/serializers.py
+0
-2
tests/test_fields.py
+17
-0
No files found.
rest_framework/fields.py
View file @
d1b2c8ac
...
@@ -150,10 +150,6 @@ class Field(object):
...
@@ -150,10 +150,6 @@ class Field(object):
messages
.
update
(
error_messages
or
{})
messages
.
update
(
error_messages
or
{})
self
.
error_messages
=
messages
self
.
error_messages
=
messages
for
validator
in
validators
:
if
getattr
(
validator
,
'requires_context'
,
False
):
validator
.
serializer_field
=
self
def
bind
(
self
,
field_name
,
parent
):
def
bind
(
self
,
field_name
,
parent
):
"""
"""
Initializes the field name and parent for the field instance.
Initializes the field name and parent for the field instance.
...
@@ -264,6 +260,8 @@ class Field(object):
...
@@ -264,6 +260,8 @@ class Field(object):
"""
"""
errors
=
[]
errors
=
[]
for
validator
in
self
.
validators
:
for
validator
in
self
.
validators
:
if
getattr
(
validator
,
'requires_context'
,
False
):
validator
.
serializer_field
=
self
try
:
try
:
validator
(
value
)
validator
(
value
)
except
ValidationError
as
exc
:
except
ValidationError
as
exc
:
...
@@ -907,7 +905,11 @@ class FileField(Field):
...
@@ -907,7 +905,11 @@ class FileField(Field):
def
to_representation
(
self
,
value
):
def
to_representation
(
self
,
value
):
if
self
.
use_url
:
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
return
value
.
name
...
...
rest_framework/serializers.py
View file @
d1b2c8ac
...
@@ -428,7 +428,6 @@ class ModelSerializer(Serializer):
...
@@ -428,7 +428,6 @@ class ModelSerializer(Serializer):
queryset
=
model_class
.
_default_manager
,
queryset
=
model_class
.
_default_manager
,
fields
=
unique_together
fields
=
unique_together
)
)
validator
.
serializer_field
=
self
validators
.
append
(
validator
)
validators
.
append
(
validator
)
for
parent_class
in
model_class
.
_meta
.
parents
.
keys
():
for
parent_class
in
model_class
.
_meta
.
parents
.
keys
():
...
@@ -438,7 +437,6 @@ class ModelSerializer(Serializer):
...
@@ -438,7 +437,6 @@ class ModelSerializer(Serializer):
queryset
=
parent_class
.
_default_manager
,
queryset
=
parent_class
.
_default_manager
,
fields
=
unique_together
fields
=
unique_together
)
)
validator
.
serializer_field
=
self
validators
.
append
(
validator
)
validators
.
append
(
validator
)
return
validators
return
validators
...
...
tests/test_fields.py
View file @
d1b2c8ac
...
@@ -953,6 +953,23 @@ class TestListField(FieldValues):
...
@@ -953,6 +953,23 @@ class TestListField(FieldValues):
field
=
fields
.
ListField
(
child
=
fields
.
IntegerField
())
field
=
fields
.
ListField
(
child
=
fields
.
IntegerField
())
# Tests for FieldField.
# ---------------------
class
MockRequest
:
def
build_absolute_uri
(
self
,
value
):
return
'http://example.com'
+
value
class
TestFileFieldContext
:
def
test_fully_qualified_when_request_in_context
(
self
):
field
=
fields
.
FileField
(
max_length
=
10
)
field
.
_context
=
{
'request'
:
MockRequest
()}
obj
=
MockFile
(
name
=
'example.txt'
,
url
=
'/example.txt'
)
value
=
field
.
to_representation
(
obj
)
assert
value
==
'http://example.com/example.txt'
# Tests for SerializerMethodField.
# Tests for SerializerMethodField.
# --------------------------------
# --------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment