github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1805 from jumpserver/dev 

Dev
pull/1864/head 1.4.1
老广 2018-09-11 16:04:18 +08:00 committed by GitHub
parent 1d462aea1b c78107f62f
commit 2a37107abc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/perms/templates/perms/asset_permission_create_update.html
View File

@ -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) {
if ($(e.target).attr('class') !== 'select2-selection__choice__remove'){
e.preventDefault(); e.preventDefault();
e.stopPropagation();
$("#asset_list_modal").modal(); $("#asset_list_modal").modal();
}
}) })
}) })
.on('click', '#btn_asset_modal_confirm', function () { .on('click', '#btn_asset_modal_confirm', function () {

4
jms
View File

@ -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,