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
315159e4
Commit
315159e4
authored
Feb 26, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
parents
08ccac3f
fc61dea9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
models.py
apps/terminal/models.py
+7
-1
No files found.
apps/terminal/models.py
View file @
315159e4
...
...
@@ -45,7 +45,12 @@ class Terminal(models.Model):
return
{
"TERMINAL_COMMAND_STORAGE"
:
storage
}
def
get_replay_storage
(
self
):
pass
storage_all
=
settings
.
TERMINAL_REPLAY_STORAGE
if
self
.
replay_storage
in
storage_all
:
storage
=
storage_all
.
get
(
self
.
replay_storage
)
else
:
storage
=
storage_all
.
get
(
'default'
)
return
{
"TERMINAL_REPLAY_STORAGE"
:
storage
}
@property
def
config
(
self
):
...
...
@@ -54,6 +59,7 @@ class Terminal(models.Model):
if
k
.
startswith
(
'TERMINAL'
):
configs
[
k
]
=
getattr
(
settings
,
k
)
configs
.
update
(
self
.
get_common_storage
())
configs
.
update
(
self
.
get_replay_storage
())
return
configs
def
create_app_user
(
self
):
...
...
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