配置生效时,验证编译配置下的asn配置是否已经被删除,提醒用户重新编辑
This commit is contained in:
@@ -143,8 +143,10 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
|
||||
if(validateAllNoAudit(checkboxes)){
|
||||
top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
|
||||
return;
|
||||
}else if(validAsnIsDeleted(checkboxes)){
|
||||
return;
|
||||
}else{
|
||||
doAll(checkboxes,url);
|
||||
doAll(checkboxes,url);
|
||||
}
|
||||
}else{
|
||||
/* 批量下发待测试
|
||||
@@ -185,13 +187,19 @@ function cancelPassOpt(url){
|
||||
if(validateAllPass(checkboxes)){
|
||||
|
||||
var addrPoolIds = [],canCancel = true;
|
||||
var compileIds = [];
|
||||
$(checkboxes).filter(":checked").each(function(){
|
||||
var addrPoolId = $(this).attr("addressPoolId");
|
||||
var serviceId = $(this).attr("serviceId");
|
||||
var compileId = $(this).attr("compileId");
|
||||
if(typeof addrPoolId != "undefined"){
|
||||
addrPoolIds.push(addrPoolId);
|
||||
}
|
||||
//记录代理证书的配置
|
||||
if(typeof serviceId != "undefined" && serviceId==520 && typeof compileId != "undefined"){
|
||||
compileIds.push(compileId);
|
||||
}
|
||||
});
|
||||
|
||||
// 地址池管理 (被策略引用的地址池不可取消)
|
||||
if(addrPoolIds.length > 0){
|
||||
$.ajax({
|
||||
@@ -207,6 +215,23 @@ function cancelPassOpt(url){
|
||||
}
|
||||
});
|
||||
}
|
||||
if(canCancel){
|
||||
//查询证书是否被拦截策略引用
|
||||
if(compileIds.length > 0){
|
||||
$.ajax({
|
||||
type:'post',
|
||||
url:'${ctx}/proxy/intercept/strateagy/ajaxKeyinfIsUsed',
|
||||
data:{"compileIds":compileIds.join(',')},
|
||||
async:false,
|
||||
success:function(data){//处理返回结果
|
||||
if(data == false){
|
||||
top.$.jBox.tip('<spring:message code="keyring_is_used"/>');
|
||||
canCancel=data;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if(canCancel){
|
||||
doAll(checkboxes,url);
|
||||
@@ -381,6 +406,40 @@ function cancelPassOpt(url){
|
||||
});
|
||||
return flag;
|
||||
}
|
||||
//配置审核通过之前,测试此配置下是否有已经删除的ASN,提示用户重新编辑再下发
|
||||
function validAsnIsDeleted(checkboxes){
|
||||
var flag = false;
|
||||
var compileIdStr="";
|
||||
checkboxes.each(function(){
|
||||
if(true == $(this).is(':checked')){
|
||||
compileIdStr +=$(this).parent().find("span[cfgid='"+$(this).attr("id")+"']").attr("compileId")+",";
|
||||
}
|
||||
});
|
||||
//根据compileId查询,此配置下是否有配置已经删除
|
||||
$.ajax({
|
||||
type:'post',
|
||||
url:'${ctx}/basics/asnGroup/checkAsnRegionIsDeleted',
|
||||
data:{"compileIds":compileIdStr},
|
||||
async:false,
|
||||
success:function(data,textStatus){//处理返回结果
|
||||
if(textStatus == 'success'){
|
||||
var keyValue="";
|
||||
for(var key in data){ //key data[key]
|
||||
console.log(key + "==" + data[key]);
|
||||
keyValue+=data[key]+"<br>";
|
||||
}
|
||||
if(keyValue !=''){
|
||||
top.$.jBox.info(keyValue+"<spring:message code='reedit'/>","<spring:message code='info'/>");
|
||||
top.$('.jbox-body .jbox-icon').css('top','55px');
|
||||
flag= true;
|
||||
}
|
||||
|
||||
}
|
||||
/* window.location = url+"&ids="+ids+"&compileIds="+compileIds; */
|
||||
}
|
||||
});
|
||||
return flag;
|
||||
}
|
||||
//验证是否可删除
|
||||
function validateIsDelete(checkboxes){
|
||||
var flag = false;
|
||||
|
||||
Reference in New Issue
Block a user