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

pull/1805/head
ibuler 6 years ago
parent 88a29c0a93
commit 6dc2272a26

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

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

Loading…
Cancel
Save