Unverified Commit 765fedc1 authored by 老广's avatar 老广 Committed by GitHub

Merge pull request #262 from jumpserver/dev

Dev
parents b9bc53d1 2d7aab29
...@@ -215,8 +215,9 @@ class SSHConnection: ...@@ -215,8 +215,9 @@ class SSHConnection:
) )
if not domain.has_ssh_gateway(): if not domain.has_ssh_gateway():
return None return None
for i in domain.gateways: for gateway in domain.gateways:
gateway = domain.random_ssh_gateway() if gateway.protocol != "ssh":
continue
ssh = paramiko.SSHClient() ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy()) ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
try: try:
......
...@@ -1280,7 +1280,8 @@ div.elfinder-cwd-wrapper-list .ui-icon-grip-dotted-vertical { ...@@ -1280,7 +1280,8 @@ div.elfinder-cwd-wrapper-list .ui-icon-grip-dotted-vertical {
} }
.elfinder-cwd-file.ui-selected { .elfinder-cwd-file.ui-selected {
background: #455158; background: #455158;
color: #555; /*color: #555;*/
color: #ddd;
width: 120px !important; width: 120px !important;
} }
.elfinder-cwd-filename input, .elfinder-cwd-filename input,
...@@ -1309,10 +1310,10 @@ div.elfinder-cwd-wrapper-list .ui-icon-grip-dotted-vertical { ...@@ -1309,10 +1310,10 @@ div.elfinder-cwd-wrapper-list .ui-icon-grip-dotted-vertical {
padding: 0; padding: 0;
} }
.elfinder-cwd table tr:nth-child(odd) { .elfinder-cwd table tr:nth-child(odd) {
background-color: transparent; /*background-color: transparent;*/
} }
.elfinder-cwd table tr:nth-child(odd).ui-state-hover { .elfinder-cwd table tr:nth-child(odd).ui-state-hover {
background-color: #4c5961; /*background-color: #4c5961;*/
} }
#elfinder-elfinder-cwd-thead td { #elfinder-elfinder-cwd-thead td {
background: #353b42; background: #353b42;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment