Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
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
ops
jumpserver
Commits
f74422e4
Commit
f74422e4
authored
Dec 01, 2017
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 更改application models后导致 terminalstatus报错
parent
3120cef3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
api.py
apps/terminal/api.py
+3
-3
serializers.py
apps/terminal/serializers.py
+1
-1
No files found.
apps/terminal/api.py
View file @
f74422e4
...
...
@@ -109,7 +109,7 @@ class TerminalStatusViewSet(viewsets.ModelViewSet):
terminal_id
=
self
.
kwargs
.
get
(
"terminal"
,
None
)
if
terminal_id
:
terminal
=
get_object_or_404
(
Terminal
,
id
=
terminal_id
)
self
.
queryset
=
terminal
.
terminal
status_set
.
all
()
self
.
queryset
=
terminal
.
status_set
.
all
()
return
self
.
queryset
def
perform_create
(
self
,
serializer
):
...
...
@@ -131,7 +131,7 @@ class TerminalSessionViewSet(viewsets.ModelViewSet):
terminal_id
=
self
.
kwargs
.
get
(
"terminal"
,
None
)
if
terminal_id
:
terminal
=
get_object_or_404
(
Terminal
,
id
=
terminal_id
)
self
.
queryset
=
terminal
.
terminal
status_set
.
all
()
self
.
queryset
=
terminal
.
status_set
.
all
()
return
self
.
queryset
...
...
@@ -144,7 +144,7 @@ class TerminalTaskViewSet(viewsets.ModelViewSet):
terminal_id
=
self
.
kwargs
.
get
(
"terminal"
,
None
)
if
terminal_id
:
terminal
=
get_object_or_404
(
Terminal
,
id
=
terminal_id
)
self
.
queryset
=
terminal
.
terminal
status_set
.
all
()
self
.
queryset
=
terminal
.
status_set
.
all
()
if
hasattr
(
self
.
request
.
user
,
"terminal"
):
terminal
=
self
.
request
.
user
.
terminal
...
...
apps/terminal/serializers.py
View file @
f74422e4
...
...
@@ -23,7 +23,7 @@ class TerminalSerializer(serializers.ModelSerializer):
@staticmethod
def
get_is_alive
(
obj
):
log
=
obj
.
terminal
status_set
.
last
()
log
=
obj
.
status_set
.
last
()
if
log
and
timezone
.
now
()
-
log
.
date_created
<
timezone
.
timedelta
(
seconds
=
600
):
return
True
else
:
...
...
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