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

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

pull/1805/head
ibuler 2018-09-11 12:17:17 +08:00
parent 88a29c0a93
commit 6dc2272a26
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ $(document).ready(function () {
closeOnSelect: false closeOnSelect: false
}); });
$('#datepicker').datepicker({ $('#datepicker').datepicker({
format: "yyyy-mm-dd", format: "yyyy-mm-dd HH:mm",
todayBtn: "linked", todayBtn: "linked",
keyboardNavigation: false, keyboardNavigation: false,
forceParse: false, forceParse: false,
@ -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 () {

2
jms
View File

@ -122,7 +122,7 @@ def start_gunicorn():
cmd = [ cmd = [
'gunicorn', 'jumpserver.wsgi', 'gunicorn', 'jumpserver.wsgi',
'-b', bind, '-b', bind,
'-k', 'eventlet', #'-k', 'eventlet',
'-w', str(WORKERS), '-w', str(WORKERS),
'--access-logformat', log_format, '--access-logformat', log_format,
'-p', pid_file, '-p', pid_file,