From 87deb18791b2412bec9f724add4f1fe35d91fe64 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 22 Oct 2019 15:53:24 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9command=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C=E5=B7=A6=E4=BE=A7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/backends/manager.py                      | 2 --
 apps/ops/templates/ops/command_execution_create.html | 5 ++---
 apps/ops/views/command.py                            | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/assets/backends/manager.py b/apps/assets/backends/manager.py
index ac81307df..75b9c38b8 100644
--- a/apps/assets/backends/manager.py
+++ b/apps/assets/backends/manager.py
@@ -67,8 +67,6 @@ class AssetUserManager:
         return AssetUserQuerySet(instances)
 
     def get(self, username, asset, **kwargs):
-        print(username)
-        print(asset)
         instances = self.filter(username, assets=[asset], **kwargs)
         if len(instances) == 1:
             return instances[0]
diff --git a/apps/ops/templates/ops/command_execution_create.html b/apps/ops/templates/ops/command_execution_create.html
index 426cdfda0..9176c608d 100644
--- a/apps/ops/templates/ops/command_execution_create.html
+++ b/apps/ops/templates/ops/command_execution_create.html
@@ -80,9 +80,7 @@
                                 <select class="select2 form-control"
                                         id="system-users-select">
                                     {% for s in system_users %}
-                                        {% if s.protocol == 'ssh' and s.login_mode == 'auto' %}
-                                            <option value="{{ s.id }}">{{ s }}</option>
-                                        {% endif %}
+                                        <option value="{{ s.id }}" {% if s.protocol != 'ssh' or s.login_mode != 'auto' %}disabled{% endif %}>{{ s }}</option>
                                     {% endfor %}
                                 </select>
                                 <button type="button"
@@ -207,6 +205,7 @@
                 lineHeight: 1,
                 rightClickSelectsWord: true,
                 disableStdin: true,
+                cursorBlink: false,
                 theme: {
                     background: '#1f1b1b'
                 }
diff --git a/apps/ops/views/command.py b/apps/ops/views/command.py
index ba00bc617..0824b4b93 100644
--- a/apps/ops/views/command.py
+++ b/apps/ops/views/command.py
@@ -70,7 +70,7 @@ class CommandExecutionStartView(PermissionsMixin, TemplateView):
         user = self.request.user
         with tmp_to_root_org():
             util = AssetPermissionUtilV2(user)
-            system_users = [s for s in util.get_system_users() if s.protocol == 'ssh']
+            system_users = util.get_system_users()
         return system_users
 
     def get_context_data(self, **kwargs):