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
2a2ce406
Commit
2a2ce406
authored
Nov 10, 2012
by
Marko Tibold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #380
parent
df689a74
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
rest_framework/fields.py
+4
-1
rest_framework/tests/hyperlinkedserializers.py
+3
-3
No files found.
rest_framework/fields.py
View file @
2a2ce406
...
@@ -522,7 +522,10 @@ class HyperlinkedRelatedField(RelatedField):
...
@@ -522,7 +522,10 @@ class HyperlinkedRelatedField(RelatedField):
view_name
=
self
.
view_name
view_name
=
self
.
view_name
request
=
self
.
context
.
get
(
'request'
,
None
)
request
=
self
.
context
.
get
(
'request'
,
None
)
format
=
self
.
format
or
self
.
context
.
get
(
'format'
,
None
)
format
=
self
.
format
or
self
.
context
.
get
(
'format'
,
None
)
kwargs
=
{
self
.
pk_url_kwarg
:
obj
.
pk
}
pk
=
getattr
(
obj
,
'pk'
,
None
)
if
pk
is
None
:
return
kwargs
=
{
self
.
pk_url_kwarg
:
pk
}
try
:
try
:
return
reverse
(
view_name
,
kwargs
=
kwargs
,
request
=
request
,
format
=
format
)
return
reverse
(
view_name
,
kwargs
=
kwargs
,
request
=
request
,
format
=
format
)
except
:
except
:
...
...
rest_framework/tests/hyperlinkedserializers.py
View file @
2a2ce406
...
@@ -224,11 +224,12 @@ class TestOptionalRelationHyperlinkedView(TestCase):
...
@@ -224,11 +224,12 @@ class TestOptionalRelationHyperlinkedView(TestCase):
def
setUp
(
self
):
def
setUp
(
self
):
"""
"""
Create 1 OptionaRelationModel intances.
Create 1 Optiona
l
RelationModel intances.
"""
"""
OptionalRelationModel
()
.
save
()
OptionalRelationModel
()
.
save
()
self
.
objects
=
OptionalRelationModel
.
objects
self
.
objects
=
OptionalRelationModel
.
objects
self
.
detail_view
=
OptionalRelationDetail
.
as_view
()
self
.
detail_view
=
OptionalRelationDetail
.
as_view
()
self
.
data
=
{
"url"
:
"http://testserver/optionalrelation/1/"
,
"other"
:
None
}
def
test_get_detail_view
(
self
):
def
test_get_detail_view
(
self
):
"""
"""
...
@@ -238,5 +239,4 @@ class TestOptionalRelationHyperlinkedView(TestCase):
...
@@ -238,5 +239,4 @@ class TestOptionalRelationHyperlinkedView(TestCase):
request
=
factory
.
get
(
'/optionalrelationmodel-detail/1'
)
request
=
factory
.
get
(
'/optionalrelationmodel-detail/1'
)
response
=
self
.
detail_view
(
request
,
pk
=
1
)
.
render
()
response
=
self
.
detail_view
(
request
,
pk
=
1
)
.
render
()
self
.
assertEquals
(
response
.
status_code
,
status
.
HTTP_200_OK
)
self
.
assertEquals
(
response
.
status_code
,
status
.
HTTP_200_OK
)
self
.
assertEquals
(
response
.
data
,
self
.
data
)
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