Merge pull request #126 from jumpserver/dev

Dev

coco/app.py

@@ -20,7 +20,7 @@ from .session import Session
 from .models import Connection
 
 
-__version__ = '1.4.3'
+__version__ = '1.4.4'
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 logger = get_logger(__file__)

coco/interactive.py

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