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
eb3d4d0e
Commit
eb3d4d0e
authored
Jan 16, 2013
by
Tom Christie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Drop bits of relations_slug tests which don't mirror existing tests.
parent
875841c7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
1 deletions
+6
-1
rest_framework/relations.py
+3
-0
rest_framework/tests/relations_hyperlink.py
+2
-0
rest_framework/tests/relations_pk.py
+1
-1
rest_framework/tests/relations_slug.py
+0
-0
No files found.
rest_framework/relations.py
View file @
eb3d4d0e
...
...
@@ -105,6 +105,9 @@ class RelatedField(WritableField):
value
=
getattr
(
obj
,
self
.
source
or
field_name
)
except
ObjectDoesNotExist
:
return
None
if
value
is
None
:
return
None
return
self
.
to_native
(
value
)
def
field_from_native
(
self
,
data
,
files
,
field_name
,
into
):
...
...
rest_framework/tests/relations_hyperlink.py
View file @
eb3d4d0e
...
...
@@ -3,6 +3,7 @@ from rest_framework import serializers
from
rest_framework.compat
import
patterns
,
url
from
rest_framework.tests.models
import
ManyToManyTarget
,
ManyToManySource
,
ForeignKeyTarget
,
ForeignKeySource
,
NullableForeignKeySource
,
OneToOneTarget
,
NullableOneToOneSource
def
dummy_view
(
request
,
pk
):
pass
...
...
@@ -16,6 +17,7 @@ urlpatterns = patterns('',
url
(
r'^nullableonetoonesource/(?P<pk>[0-9]+)/$'
,
dummy_view
,
name
=
'nullableonetoonesource-detail'
),
)
class
ManyToManyTargetSerializer
(
serializers
.
HyperlinkedModelSerializer
):
sources
=
serializers
.
ManyHyperlinkedRelatedField
(
view_name
=
'manytomanysource-detail'
)
...
...
rest_framework/tests/relations_pk.py
View file @
eb3d4d0e
...
...
@@ -206,7 +206,7 @@ class PKForeignKeyTests(TestCase):
expected
=
[
{
'id'
:
1
,
'name'
:
u'target-1'
,
'sources'
:
[
1
,
2
,
3
]},
{
'id'
:
2
,
'name'
:
u'target-2'
,
'sources'
:
[]},
]
]
self
.
assertEquals
(
new_serializer
.
data
,
expected
)
serializer
.
save
()
...
...
rest_framework/tests/relations_slug.py
View file @
eb3d4d0e
This diff is collapsed.
Click to expand it.
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