diff --git a/apps/perms/templates/perms/asset_permission_create_update.html b/apps/perms/templates/perms/asset_permission_create_update.html index 2f9ebeeafb26eedb24cb9b8e86dd49d96a6e062a..0ec3ae639c0087672d649352fc7b1e08f537b2fb 100644 --- a/apps/perms/templates/perms/asset_permission_create_update.html +++ b/apps/perms/templates/perms/asset_permission_create_update.html @@ -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 5e334c926eb2bebac2f16b92fe90b5fec6fa1a7f..774479df9e9d162b30f4b7a0bf01ad34312a1ce6 100755 --- a/jms +++ b/jms @@ -122,7 +122,9 @@ def start_gunicorn(): cmd = [ 'gunicorn', 'jumpserver.wsgi', '-b', bind, - '-k', 'eventlet', + #'-k', 'eventlet', + '-k', 'gthread', + '--threads', '10', '-w', str(WORKERS), '--access-logformat', log_format, '-p', pid_file,