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
3fba60e9
Commit
3fba60e9
authored
Aug 30, 2013
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop broken placeholder serializations.
parent
2247fd68
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
rest_framework/renderers.py
+10
-3
rest_framework/serializers.py
+2
-1
rest_framework/tests/test_serializer.py
+0
-1
No files found.
rest_framework/renderers.py
View file @
3fba60e9
...
@@ -338,6 +338,11 @@ class HTMLFormRenderer(BaseRenderer):
...
@@ -338,6 +338,11 @@ class HTMLFormRenderer(BaseRenderer):
fields
=
{}
fields
=
{}
for
key
,
val
in
data
.
fields
.
items
():
for
key
,
val
in
data
.
fields
.
items
():
if
getattr
(
val
,
'read_only'
,
True
):
if
getattr
(
val
,
'read_only'
,
True
):
# Don't include read-only fields.
continue
if
getattr
(
val
,
'fields'
,
None
):
# Nested data not supported by HTML forms.
continue
continue
kwargs
=
{}
kwargs
=
{}
...
@@ -476,6 +481,7 @@ class BrowsableAPIRenderer(BaseRenderer):
...
@@ -476,6 +481,7 @@ class BrowsableAPIRenderer(BaseRenderer):
return
return
serializer
=
view
.
get_serializer
(
instance
=
obj
)
serializer
=
view
.
get_serializer
(
instance
=
obj
)
data
=
serializer
.
data
data
=
serializer
.
data
form_renderer
=
self
.
form_renderer_class
()
form_renderer
=
self
.
form_renderer_class
()
return
form_renderer
.
render
(
data
,
self
.
accepted_media_type
,
self
.
renderer_context
)
return
form_renderer
.
render
(
data
,
self
.
accepted_media_type
,
self
.
renderer_context
)
...
@@ -508,9 +514,10 @@ class BrowsableAPIRenderer(BaseRenderer):
...
@@ -508,9 +514,10 @@ class BrowsableAPIRenderer(BaseRenderer):
# Get a read-only version of the serializer
# Get a read-only version of the serializer
serializer
=
view
.
get_serializer
(
instance
=
obj
)
serializer
=
view
.
get_serializer
(
instance
=
obj
)
for
field_name
,
field
in
serializer
.
fields
.
items
():
if
obj
is
None
:
if
field
.
read_only
:
for
name
,
field
in
serializer
.
fields
.
items
():
del
serializer
.
fields
[
field_name
]
if
getattr
(
field
,
'read_only'
,
None
):
del
serializer
.
fields
[
name
]
# Render the raw data content
# Render the raw data content
renderer
=
renderer_class
()
renderer
=
renderer_class
()
...
...
rest_framework/serializers.py
View file @
3fba60e9
...
@@ -334,13 +334,14 @@ class BaseSerializer(WritableField):
...
@@ -334,13 +334,14 @@ class BaseSerializer(WritableField):
if
self
.
source
==
'*'
:
if
self
.
source
==
'*'
:
return
self
.
to_native
(
obj
)
return
self
.
to_native
(
obj
)
# Get the raw field value
try
:
try
:
source
=
self
.
source
or
field_name
source
=
self
.
source
or
field_name
value
=
obj
value
=
obj
for
component
in
source
.
split
(
'.'
):
for
component
in
source
.
split
(
'.'
):
if
value
is
None
:
if
value
is
None
:
return
self
.
to_native
(
None
)
break
value
=
get_component
(
value
,
component
)
value
=
get_component
(
value
,
component
)
except
ObjectDoesNotExist
:
except
ObjectDoesNotExist
:
return
None
return
None
...
...
rest_framework/tests/test_serializer.py
View file @
3fba60e9
...
@@ -158,7 +158,6 @@ class BasicTests(TestCase):
...
@@ -158,7 +158,6 @@ class BasicTests(TestCase):
'email'
:
''
,
'email'
:
''
,
'content'
:
''
,
'content'
:
''
,
'created'
:
None
,
'created'
:
None
,
'sub_comment'
:
''
}
}
self
.
assertEqual
(
serializer
.
data
,
expected
)
self
.
assertEqual
(
serializer
.
data
,
expected
)
...
...
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