Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
feudal
feudalBackend
Commits
02d94148
Commit
02d94148
authored
Apr 19, 2018
by
Lukas Burgey
Browse files
Adapt some details for django 2.0 upgrade
parent
aa512383
Changes
2
Hide whitespace changes
Inline
Side-by-side
django_backend/backend/frontend/views.py
View file @
02d94148
...
...
@@ -29,9 +29,10 @@ def _api_error_response():
# Response for StateView, LogoutView, and all post requests
def
_api_state_response
(
request
):
response
=
{
'logged_in'
:
request
.
user
.
is_authenticated
()
'logged_in'
:
request
.
user
.
is_authenticated
}
if
request
.
user
.
is_authenticated
()
:
if
request
.
user
.
is_authenticated
:
response
[
'user'
]
=
serializers
.
UserSerializer
(
request
.
user
).
data
...
...
django_backend/backend/models.py
View file @
02d94148
...
...
@@ -318,9 +318,12 @@ class SSHPublicKey(models.Model):
max_length
=
1000
)
# hidden field at the user
# TODO checks: if the user is null
user
=
models
.
ForeignKey
(
User
,
related_name
=
'_ssh_keys'
,
on_delete
=
models
.
SET_NULL
,
null
=
True
,
)
# has the user triggered the deletion of this key
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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