(1)修复in() sql中 使用了#导致的bug,#修改为$
(2)asn 策略组删除时判断其下有没有新增的ip,如果有,则不允许删除
This commit is contained in:
@@ -47,6 +47,7 @@
|
||||
ids = str.substr(0,str.length-1);
|
||||
}
|
||||
var canDel=true;
|
||||
var tip='<spring:message code="can_not_delete_issued_asn_group"/>';
|
||||
if(serviceGroupIds.length>0){
|
||||
$.ajax({
|
||||
type:'post',
|
||||
@@ -59,11 +60,25 @@
|
||||
}
|
||||
}
|
||||
});
|
||||
if(canDel){
|
||||
$.ajax({
|
||||
type:'post',
|
||||
url:'${ctx}/basics/policyGroup/ajaxHasAsnIPs',
|
||||
data:{"serviceGroupIds":serviceGroupIds.join(',')},
|
||||
async:false,
|
||||
success:function(data,textStatus){//处理返回结果
|
||||
if(data){
|
||||
canDel=false;
|
||||
tip='<spring:message code="can_not_delete_has_ip_asn_group"/>';
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
if(canDel){
|
||||
window.location = url+"&ids="+ids;
|
||||
}else{
|
||||
$.jBox.tip('<spring:message code="can_not_delete_issued_asn_group"/>');
|
||||
$.jBox.tip(tip);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user