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
eafb7e1e
Commit
eafb7e1e
authored
Nov 07, 2014
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ModelField fix. Closes #2018.
parent
a16a8a10
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletions
+5
-1
rest_framework/fields.py
+5
-1
No files found.
rest_framework/fields.py
View file @
eafb7e1e
...
...
@@ -1180,7 +1180,6 @@ class ModelField(Field):
def
__init__
(
self
,
model_field
,
**
kwargs
):
self
.
model_field
=
model_field
kwargs
[
'source'
]
=
'*'
# The `max_length` option is supported by Django's base `Field` class,
# so we'd better support it here.
max_length
=
kwargs
.
pop
(
'max_length'
,
None
)
...
...
@@ -1195,6 +1194,11 @@ class ModelField(Field):
return
rel
.
to
.
_meta
.
get_field
(
rel
.
field_name
)
.
to_python
(
data
)
return
self
.
model_field
.
to_python
(
data
)
def
get_attribute
(
self
,
obj
):
# We pass the object instance onto `to_representation`,
# not just the field attribute.
return
obj
def
to_representation
(
self
,
obj
):
value
=
self
.
model_field
.
_get_val_from_obj
(
obj
)
if
is_protected_type
(
value
):
...
...
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