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
22a84d57
Commit
22a84d57
authored
May 25, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
[Update] 修改树形结构
parents
3f4b5ad4
b9d0d89f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
__init__.py
apps/__init__.py
+1
-1
_footer.html
apps/templates/_footer.html
+1
-1
api.py
apps/terminal/api.py
+2
-3
No files found.
apps/__init__.py
View file @
22a84d57
...
@@ -2,4 +2,4 @@
...
@@ -2,4 +2,4 @@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
#
#
__version__
=
"1.3.
0
"
__version__
=
"1.3.
1
"
apps/templates/_footer.html
View file @
22a84d57
<div
class=
"footer fixed"
>
<div
class=
"footer fixed"
>
<div
class=
"pull-right"
>
<div
class=
"pull-right"
>
Version
<strong>
1.3.
0
-{% include '_build.html' %}
</strong>
GPLv2.
Version
<strong>
1.3.
1
-{% include '_build.html' %}
</strong>
GPLv2.
<img
style=
"display: none"
src=
"http://www.jumpserver.org/img/evaluate_avatar1.jpg"
>
<img
style=
"display: none"
src=
"http://www.jumpserver.org/img/evaluate_avatar1.jpg"
>
</div>
</div>
<div>
<div>
...
...
apps/terminal/api.py
View file @
22a84d57
...
@@ -109,9 +109,8 @@ class StatusViewSet(viewsets.ModelViewSet):
...
@@ -109,9 +109,8 @@ class StatusViewSet(viewsets.ModelViewSet):
task_serializer_class
=
TaskSerializer
task_serializer_class
=
TaskSerializer
def
create
(
self
,
request
,
*
args
,
**
kwargs
):
def
create
(
self
,
request
,
*
args
,
**
kwargs
):
if
self
.
request
.
query_params
.
get
(
"from_guacamole"
,
None
):
from_gua
=
self
.
request
.
query_params
.
get
(
"from_guacamole"
,
None
)
return
Response
({
"msg"
:
"From guacamole, not support now"
})
if
not
from_gua
:
self
.
handle_sessions
()
self
.
handle_sessions
()
super
()
.
create
(
request
,
*
args
,
**
kwargs
)
super
()
.
create
(
request
,
*
args
,
**
kwargs
)
tasks
=
self
.
request
.
user
.
terminal
.
task_set
.
filter
(
is_finished
=
False
)
tasks
=
self
.
request
.
user
.
terminal
.
task_set
.
filter
(
is_finished
=
False
)
...
...
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