github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' of bitbucket.org:jumpserver/core into dev

pull/1044/head
ibuler 2018-02-26 18:12:20 +08:00
parent 08ccac3f66 fc61dea9b5
commit 315159e4b6
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/terminal/models.py
View File

@ -45,7 +45,12 @@ class Terminal(models.Model):
return {"TERMINAL_COMMAND_STORAGE": storage} return {"TERMINAL_COMMAND_STORAGE": storage}
def get_replay_storage(self): 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 @property
def config(self): def config(self):
@ -54,6 +59,7 @@ class Terminal(models.Model):
if k.startswith('TERMINAL'): if k.startswith('TERMINAL'):
configs[k] = getattr(settings, k) configs[k] = getattr(settings, k)
configs.update(self.get_common_storage()) configs.update(self.get_common_storage())
configs.update(self.get_replay_storage())
return configs return configs
def create_app_user(self): def create_app_user(self):