Unverified Commit 958969e9 authored by 老广's avatar 老广 Committed by GitHub

Merge pull request #125 from jumpserver/dev_banner

[Update] 分页展示资产,连接资产失败后,不显示banner页面
parents 88a9e2d3 d4276bf5
...@@ -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)
...@@ -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