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
b76bf3d6
Commit
b76bf3d6
authored
Jan 14, 2016
by
Xavier Ordoquy
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3832 from atombrella/warnings_20_fkeys
Regarding #3729
parents
29f84aa4
215e1b6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
rest_framework/authtoken/models.py
+2
-1
tests/models.py
+5
-3
No files found.
rest_framework/authtoken/models.py
View file @
b76bf3d6
...
@@ -18,7 +18,8 @@ class Token(models.Model):
...
@@ -18,7 +18,8 @@ class Token(models.Model):
The default authorization token model.
The default authorization token model.
"""
"""
key
=
models
.
CharField
(
max_length
=
40
,
primary_key
=
True
)
key
=
models
.
CharField
(
max_length
=
40
,
primary_key
=
True
)
user
=
models
.
OneToOneField
(
AUTH_USER_MODEL
,
related_name
=
'auth_token'
)
user
=
models
.
OneToOneField
(
AUTH_USER_MODEL
,
related_name
=
'auth_token'
,
on_delete
=
models
.
CASCADE
)
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
created
=
models
.
DateTimeField
(
auto_now_add
=
True
)
def
save
(
self
,
*
args
,
**
kwargs
):
def
save
(
self
,
*
args
,
**
kwargs
):
...
...
tests/models.py
View file @
b76bf3d6
...
@@ -49,7 +49,8 @@ class ForeignKeyTarget(RESTFrameworkModel):
...
@@ -49,7 +49,8 @@ class ForeignKeyTarget(RESTFrameworkModel):
class
ForeignKeySource
(
RESTFrameworkModel
):
class
ForeignKeySource
(
RESTFrameworkModel
):
name
=
models
.
CharField
(
max_length
=
100
)
name
=
models
.
CharField
(
max_length
=
100
)
target
=
models
.
ForeignKey
(
ForeignKeyTarget
,
related_name
=
'sources'
,
target
=
models
.
ForeignKey
(
ForeignKeyTarget
,
related_name
=
'sources'
,
help_text
=
'Target'
,
verbose_name
=
'Target'
)
help_text
=
'Target'
,
verbose_name
=
'Target'
,
on_delete
=
models
.
CASCADE
)
# Nullable ForeignKey
# Nullable ForeignKey
...
@@ -57,7 +58,8 @@ class NullableForeignKeySource(RESTFrameworkModel):
...
@@ -57,7 +58,8 @@ class NullableForeignKeySource(RESTFrameworkModel):
name
=
models
.
CharField
(
max_length
=
100
)
name
=
models
.
CharField
(
max_length
=
100
)
target
=
models
.
ForeignKey
(
ForeignKeyTarget
,
null
=
True
,
blank
=
True
,
target
=
models
.
ForeignKey
(
ForeignKeyTarget
,
null
=
True
,
blank
=
True
,
related_name
=
'nullable_sources'
,
related_name
=
'nullable_sources'
,
verbose_name
=
'Optional target object'
)
verbose_name
=
'Optional target object'
,
on_delete
=
models
.
CASCADE
)
# OneToOne
# OneToOne
...
@@ -68,4 +70,4 @@ class OneToOneTarget(RESTFrameworkModel):
...
@@ -68,4 +70,4 @@ class OneToOneTarget(RESTFrameworkModel):
class
NullableOneToOneSource
(
RESTFrameworkModel
):
class
NullableOneToOneSource
(
RESTFrameworkModel
):
name
=
models
.
CharField
(
max_length
=
100
)
name
=
models
.
CharField
(
max_length
=
100
)
target
=
models
.
OneToOneField
(
OneToOneTarget
,
null
=
True
,
blank
=
True
,
target
=
models
.
OneToOneField
(
OneToOneTarget
,
null
=
True
,
blank
=
True
,
related_name
=
'nullable_source'
)
related_name
=
'nullable_source'
,
on_delete
=
models
.
CASCADE
)
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