github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-26 07:22:27 +00:00
Code Issues Projects Releases Wiki Activity

[Update] 修改common settings配置

Browse Source
This commit is contained in:
ibuler
2018-11-19 12:18:52 +08:00
parent c9aab608a9
commit dda367a956
9 changed files with 39 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/terminal/backends/__init__.py
View File

@@ -18,7 +18,7 @@ def get_command_storage():
def get_terminal_command_storages():
storage_list = {}
command_storage = utils.get_command_storage_or_create_default_storage()
command_storage = utils.get_command_storage_setting()
for name, params in command_storage.items():
tp = params['TYPE']

4
apps/terminal/forms.py
View File

@@ -9,14 +9,14 @@ from .models import Terminal
def get_all_command_storage():
from common import utils
command_storage = utils.get_command_storage_or_create_default_storage()
command_storage = utils.get_command_storage_setting()
for k, v in command_storage.items():
yield (k, k)
def get_all_replay_storage():
from common import utils
replay_storage = utils.get_replay_storage_or_create_default_storage()
replay_storage = utils.get_replay_storage_setting()
for k, v in replay_storage.items():
yield (k, k)

3
apps/terminal/models.py
View File

@@ -64,8 +64,7 @@ class Terminal(models.Model):
configs.update(self.get_common_storage())
configs.update(self.get_replay_storage())
configs.update({
'SECURITY_MAX_IDLE_TIME': common_settings.SECURITY_MAX_IDLE_TIME or
settings.DEFAULT_SECURITY_MAX_IDLE_TIME,
'SECURITY_MAX_IDLE_TIME': common_settings.SECURITY_MAX_IDLE_TIME
})
return configs