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
fe12816b
Commit
fe12816b
authored
Nov 13, 2015
by
Ryan Hiebert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move default validation back into init method
parent
f2452936
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
rest_framework/relations.py
+8
-4
No files found.
rest_framework/relations.py
View file @
fe12816b
...
@@ -62,6 +62,14 @@ class RelatedField(Field):
...
@@ -62,6 +62,14 @@ class RelatedField(Field):
self
.
queryset
=
kwargs
.
pop
(
'queryset'
,
self
.
queryset
)
self
.
queryset
=
kwargs
.
pop
(
'queryset'
,
self
.
queryset
)
self
.
html_cutoff
=
kwargs
.
pop
(
'html_cutoff'
,
self
.
html_cutoff
)
self
.
html_cutoff
=
kwargs
.
pop
(
'html_cutoff'
,
self
.
html_cutoff
)
self
.
html_cutoff_text
=
kwargs
.
pop
(
'html_cutoff_text'
,
self
.
html_cutoff_text
)
self
.
html_cutoff_text
=
kwargs
.
pop
(
'html_cutoff_text'
,
self
.
html_cutoff_text
)
default_get_queryset
=
getattr
(
RelatedField
.
get_queryset
,
'__func__'
,
RelatedField
.
get_queryset
)
# Python 2/3
if
self
.
get_queryset
.
__func__
==
default_get_queryset
:
assert
self
.
queryset
is
not
None
or
kwargs
.
get
(
'read_only'
,
None
),
(
'Relational field must provide a `queryset` argument, '
'or set read_only=`True`.'
)
assert
not
(
self
.
queryset
is
not
None
and
kwargs
.
get
(
'read_only'
,
None
)),
(
assert
not
(
self
.
queryset
is
not
None
and
kwargs
.
get
(
'read_only'
,
None
)),
(
'Relational fields should not provide a `queryset` argument, '
'Relational fields should not provide a `queryset` argument, '
'when setting read_only=`True`.'
'when setting read_only=`True`.'
...
@@ -108,10 +116,6 @@ class RelatedField(Field):
...
@@ -108,10 +116,6 @@ class RelatedField(Field):
def
get_queryset
(
self
):
def
get_queryset
(
self
):
queryset
=
self
.
queryset
queryset
=
self
.
queryset
assert
queryset
is
not
None
,
(
'Relational field must provide a `queryset` argument, '
'or set read_only=`True`.'
)
if
isinstance
(
queryset
,
(
QuerySet
,
Manager
)):
if
isinstance
(
queryset
,
(
QuerySet
,
Manager
)):
# Ensure queryset is re-evaluated whenever used.
# Ensure queryset is re-evaluated whenever used.
# Note that actually a `Manager` class may also be used as the
# Note that actually a `Manager` class may also be used as the
...
...
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