[Update] 修复无法取消授权资产的前端bug

york67617 · Sep 11, 2018 · 6dc2272 · 6dc2272
1 parent 88a29c0
commit 6dc2272
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/apps/perms/templates/perms/asset_permission_create_update.html b/apps/perms/templates/perms/asset_permission_create_update.html
@@ -86,16 +86,19 @@ <h3>{% trans 'Other' %}</h3>
         closeOnSelect: false
     });
     $('#datepicker').datepicker({
-        format: "yyyy-mm-dd",
+        format: "yyyy-mm-dd HH:mm",
         todayBtn: "linked",
         keyboardNavigation: false,
         forceParse: false,
         calendarWeeks: true,
         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
@@ -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,