Commit d33400d3 authored by 广宏伟's avatar 广宏伟

Merged in dev (pull request #130)

Dev
parents 7b66f773 fe6ee03e
...@@ -176,7 +176,7 @@ class InteractiveServer: ...@@ -176,7 +176,7 @@ class InteractiveServer:
self.get_user_nodes() self.get_user_nodes()
if not self.nodes: if not self.nodes:
self.client.send(wr(_('No Nodes'), before=1)) self.client.send(wr(_('No Nodes'), before=0))
return return
self.nodes_tree.show(key=lambda node: node.identifier) self.nodes_tree.show(key=lambda node: node.identifier)
...@@ -311,9 +311,9 @@ class InteractiveServer: ...@@ -311,9 +311,9 @@ class InteractiveServer:
if assets and len(assets) == 1: if assets and len(assets) == 1:
asset = assets[0] asset = assets[0]
self.search_result = None self.search_result = None
if asset.platform == "Windows": if asset.protocol == "rdp" or asset.platform.lower().startswith("windows"):
self.client.send(warning( self.client.send(warning(
_("Terminal does not support login Windows, " _("Terminal does not support login rdp, "
"please use web terminal to access")) "please use web terminal to access"))
) )
return return
...@@ -340,12 +340,12 @@ class InteractiveServer: ...@@ -340,12 +340,12 @@ class InteractiveServer:
page, result = next(gen_result) page, result = next(gen_result)
except StopIteration: except StopIteration:
logger.info('No Assets') logger.info('No Assets')
self.display_banner() # self.display_banner()
self.client.send(wr(_("No Assets"), before=1)) self.client.send(wr(_("No Assets"), before=0))
return None return None
except StopIteration: except StopIteration:
logger.info('Back display result paging.') logger.info('Back display result paging.')
self.display_banner() # self.display_banner()
return None return None
self.display_result_of_page(page, result) self.display_result_of_page(page, result)
action = self.get_user_action() action = self.get_user_action()
......
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