From 0930716a54358d74a23c989b5a34eac3766dfc24 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <bugatti_it@163.com>
Date: Mon, 21 Oct 2019 18:45:12 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=BB=84=E8=AF=A6=E6=83=85=EF=BC=8C=E7=94=A8=E6=88=B7=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD=EF=BC=9B=E5=91=BD=E4=BB=A4?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E8=AF=A6=E6=83=85=E7=BB=91=E5=AE=9A=E5=88=B0?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E7=82=B9=E5=87=BB=E4=B8=8D?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/templates/assets/cmd_filter_detail.html | 4 +++-
 apps/users/templates/users/user_group_detail.html   | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/assets/templates/assets/cmd_filter_detail.html b/apps/assets/templates/assets/cmd_filter_detail.html
index e68cba47c..8ef5d5b75 100644
--- a/apps/assets/templates/assets/cmd_filter_detail.html
+++ b/apps/assets/templates/assets/cmd_filter_detail.html
@@ -144,7 +144,9 @@ function updateCMDFilterSystemUsers(system_users) {
     });
 }
 $(document).ready(function () {
-    $(".select2").select2();
+    $(".select2").select2({
+        closeOnSelect: false
+    });
 }).on('click', '#btn-binding-system-users', function () {
     var origin_system_users = $.map($(".bdg-system-users"), function (s) {
         return $(s).data('gid')
diff --git a/apps/users/templates/users/user_group_detail.html b/apps/users/templates/users/user_group_detail.html
index ebe12af84..8f5cccf29 100644
--- a/apps/users/templates/users/user_group_detail.html
+++ b/apps/users/templates/users/user_group_detail.html
@@ -84,9 +84,6 @@
                                             <tr>
                                                 <td colspan="2" class="no-borders">
                                                     <select data-placeholder="{% trans 'Add user' %}" id="slct_users" class="select2" style="width: 100%" multiple="" tabindex="4">
-                                                        {% for user in users %}
-                                                        <option value="{{ user.id }}" id="opt_{{ user.id }}">{{ user.name }}</option>
-                                                        {% endfor %}
                                                     </select>
                                                 </td>
                                             </tr>
@@ -157,7 +154,8 @@ $(document).ready(function () {
         }).on('select2:unselect', function(evt) {
             var data = evt.params.data;
             delete jumpserver.users_selected[data.id]
-        })
+        });
+    usersSelect2Init('#slct_users')
 }).on('click', '.btn_remove_user', function() {
     var $this = $(this);
     var $tr = $this.closest('tr');