Skip to content

J
jumpserver
Unverified Commit 2a37107a authored by 老广's avatar 老广 Committed by GitHub
Browse files
Options

Merge pull request #1805 from jumpserver/dev 

Dev
parents 1d462aea c78107f6
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
apps/perms/templates/perms/asset_permission_create_update.html
View file @ 2a37107a
...@@ -94,8 +94,11 @@ $(document).ready(function () { ...@@ -94,8 +94,11 @@ $(document).ready(function () {
autoclose: true autoclose: true
}); });
$("#id_assets").parent().find(".select2-selection").on('click', function (e) { $("#id_assets").parent().find(".select2-selection").on('click', function (e) {
e.preventDefault(); if ($(e.target).attr('class') !== 'select2-selection__choice__remove'){
$("#asset_list_modal").modal(); e.preventDefault();
e.stopPropagation();
$("#asset_list_modal").modal();
}
}) })
}) })
.on('click', '#btn_asset_modal_confirm', function () { .on('click', '#btn_asset_modal_confirm', function () {
......
jms
View file @ 2a37107a
...@@ -122,7 +122,9 @@ def start_gunicorn(): ...@@ -122,7 +122,9 @@ def start_gunicorn():
cmd = [ cmd = [
'gunicorn', 'jumpserver.wsgi', 'gunicorn', 'jumpserver.wsgi',
'-b', bind, '-b', bind,
'-k', 'eventlet', #'-k', 'eventlet',
'-k', 'gthread',
'--threads', '10',
'-w', str(WORKERS), '-w', str(WORKERS),
'--access-logformat', log_format, '--access-logformat', log_format,
'-p', pid_file, '-p', pid_file,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment