From 6dc2272a26c1ed5b9da3f14586c11bd9c3157c87 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 11 Sep 2018 12:17:17 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8E=88=E6=9D=83=E8=B5=84=E4=BA=A7=E7=9A=84?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/perms/asset_permission_create_update.html  | 9 ++++++---
 jms                                                      | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/apps/perms/templates/perms/asset_permission_create_update.html b/apps/perms/templates/perms/asset_permission_create_update.html
index 2f9ebeeaf..bf884810f 100644
--- a/apps/perms/templates/perms/asset_permission_create_update.html
+++ b/apps/perms/templates/perms/asset_permission_create_update.html
@@ -86,7 +86,7 @@ $(document).ready(function () {
         closeOnSelect: false
     });
     $('#datepicker').datepicker({
-        format: "yyyy-mm-dd",
+        format: "yyyy-mm-dd HH:mm",
         todayBtn: "linked",
         keyboardNavigation: false,
         forceParse: false,
@@ -94,8 +94,11 @@ $(document).ready(function () {
         autoclose: true
     });
     $("#id_assets").parent().find(".select2-selection").on('click', function (e) {
-        e.preventDefault();
-        $("#asset_list_modal").modal();
+        if ($(e.target).attr('class') !== 'select2-selection__choice__remove'){
+            e.preventDefault();
+            e.stopPropagation();
+            $("#asset_list_modal").modal();
+        }
     })
 })
 .on('click', '#btn_asset_modal_confirm', function () {
diff --git a/jms b/jms
index 5e334c926..97d299c82 100755
--- a/jms
+++ b/jms
@@ -122,7 +122,7 @@ def start_gunicorn():
     cmd = [
         'gunicorn', 'jumpserver.wsgi',
         '-b', bind,
-        '-k', 'eventlet',
+        #'-k', 'eventlet',
         '-w', str(WORKERS),
         '--access-logformat', log_format,
         '-p', pid_file,
-- 
GitLab