gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整系统所有SubscribeID的配置，均支持SubscribeID单独下发。

Browse Source
This commit is contained in:
leijun
2019-04-09 15:31:07 +08:00
parent da9ea20e8f
commit add20445ad
9 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
View File

@@ -42,7 +42,7 @@
submitHandler : function(form) { submitHandler : function(form) {
var flag = true; var flag = true;
//存在隐藏的subscribeId，不算进域配置 //存在隐藏的subscribeId，不算进域配置
if($(".boxSolid[class~='subscribeId']").length>0){ /* if($(".boxSolid[class~='subscribeId']").length>0){
if($(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){ if($(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){
if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){ if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
@@ -57,10 +57,11 @@
} }
//代表所有业务都隐藏了，提示必须增加一种业务数据 //代表所有业务都隐藏了，提示必须增加一种业务数据
}else{ }else{
if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); } */
return; if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
} top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
} }
//代表所有区域都隐藏了，提示必须增加个区域信息 //代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){

12
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -42,7 +42,7 @@
submitHandler : function(form) { submitHandler : function(form) {
var flag = true; var flag = true;
//存在隐藏的subscribeId，不算进域配置 //存在隐藏的subscribeId，不算进域配置
if($(".boxSolid[class~='subscribeId']").length>0){ /* if($(".boxSolid[class~='subscribeId']").length>0){
if($(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){ if($(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){
if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){ if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
@@ -57,10 +57,12 @@
} }
//代表所有业务都隐藏了，提示必须增加一种业务数据 //代表所有业务都隐藏了，提示必须增加一种业务数据
}else{ }else{
if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); } */
return;
} if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
} }
//代表所有区域都隐藏了，提示必须增加个区域信息 //代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){

8
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
View File

@@ -51,7 +51,7 @@
submitHandler : function(form) { submitHandler : function(form) {
var flag = true; var flag = true;
var subscribeId=0; /* var subscribeId=0;
//存在隐藏的subscribeId，不算进域配置 //存在隐藏的subscribeId，不算进域配置
if($(".boxSolid.hidden").hasClass("subscribeId")){ if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1; subscribeId=1;
@@ -59,12 +59,12 @@
var boxSolidLenth=$(".boxSolid").length; var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){ if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1; boxSolidLenth=boxSolidLenth-1;
} } */
//代表所有业务都隐藏了，提示必须增加一种业务数据 //代表所有业务都隐藏了，提示必须增加一种业务数据
if(boxSolidLenth == ($(".boxSolid.hidden").length-subscribeId)){ if(boxSolidLenth == ($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
//代表所有区域都隐藏了，提示必须增加个区域信息 //代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();

12
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
View File

@@ -28,20 +28,20 @@
submitHandler : function(form) { submitHandler : function(form) {
var flag = true; var flag = true;
var subscribeId=0; /* var subscribeId=0;
//存在隐藏的subscribeId，不算进域配置 //存在隐藏的subscribeId，不算进域配置
if($(".boxSolid.hidden").hasClass("subscribeId")){ if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1; subscribeId=1;
} } */
var boxSolidLenth=$(".boxSolid").length; var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){ /* if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1; boxSolidLenth=boxSolidLenth-1;
} } */
//代表所有业务都隐藏了，提示必须增加一种业务数据 //代表所有业务都隐藏了，提示必须增加一种业务数据
if(boxSolidLenth == ($(".boxSolid.hidden").length-subscribeId)){ if(boxSolidLenth == ($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
//代表所有区域都隐藏了，提示必须增加个区域信息 //代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();

12
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -53,20 +53,20 @@
submitHandler : function(form) { submitHandler : function(form) {
var flag = true; var flag = true;
var subscribeId=0; /* var subscribeId=0;
//存在隐藏的subscribeId，不算进域配置 //存在隐藏的subscribeId，不算进域配置
if($(".boxSolid.hidden").hasClass("subscribeId")){ if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1; subscribeId=1;
} } */
var boxSolidLenth=$(".boxSolid").length; var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){ /* if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1; boxSolidLenth=boxSolidLenth-1;
} } */
//代表所有业务都隐藏了，提示必须增加一种业务数据 //代表所有业务都隐藏了，提示必须增加一种业务数据
if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){ if(boxSolidLenth ==($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
//代表所有区域都隐藏了，提示必须增加个区域信息 //代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();

2
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
View File

@@ -321,7 +321,7 @@
</c:if> </c:if>
<c:if test="${region.configRegionValue eq _cfg.ntcSubscribeIdCfg.cfgType }"> <c:if test="${region.configRegionValue eq _cfg.ntcSubscribeIdCfg.cfgType }">
<!--response body info--> <!--response body info-->
<div class="ntcSubscribeIdCfgCfg"> <div class="httpReqCfg ntcSubscribeIdCfgCfg">
<c:set var="tabName" value="ntcSubscribeIdCfgTab"></c:set> <c:set var="tabName" value="ntcSubscribeIdCfgTab"></c:set>
<h4 class="form-section"> <h4 class="form-section">
<spring:message code="NTC_SUBSCRIBE_ID" /> <spring:message code="NTC_SUBSCRIBE_ID" />

12
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -32,20 +32,20 @@
submitHandler : function(form) { submitHandler : function(form) {
var flag = true; var flag = true;
var subscribeId=0; /* var subscribeId=0;
//存在隐藏的subscribeId，不算进域配置 //存在隐藏的subscribeId，不算进域配置
if($(".boxSolid.hidden").hasClass("subscribeId")){ if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1; subscribeId=1;
} } */
var boxSolidLenth=$(".boxSolid").length; var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){ /* if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1; boxSolidLenth=boxSolidLenth-1;
} } */
//代表所有业务都隐藏了，提示必须增加一种业务数据 //代表所有业务都隐藏了，提示必须增加一种业务数据
if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){ if(boxSolidLenth ==($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
//代表所有区域都隐藏了，提示必须增加个区域信息 //代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();

6
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -78,12 +78,12 @@
return; return;
} }
} }
if(!$(".httpResCfg").hasClass("hidden")){ if(!$(".httpResCfg").hasClass("hidden")){
if($(".httpResCfg").find(".boxSolid").length==$(".httpResCfg").find(".boxSolid.hidden").length){ if($(".httpResCfg").find(".boxSolid").length==$(".httpResCfg").find(".boxSolid.hidden").length){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
} }
//代表所有区域都隐藏了，提示必须增加个区域信息 //代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){ if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click(); if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
@@ -397,7 +397,7 @@
</c:if> </c:if>
<c:if test="${region.configRegionValue eq _cfg.ntcSubscribeIdCfg.cfgType }"> <c:if test="${region.configRegionValue eq _cfg.ntcSubscribeIdCfg.cfgType }">
<!--response header info--> <!--response header info-->
<div class="subscribeId"> <div class="httpResCfg subscribeId httpReqCfg">
<c:set var="tabName" value="subscribeIdTab"></c:set> <c:set var="tabName" value="subscribeIdTab"></c:set>
<h4 class="form-section" > <h4 class="form-section" >
<spring:message code="${region.configRegionValue}" /> <spring:message code="${region.configRegionValue}" />

10
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

@@ -34,19 +34,19 @@
submitHandler : function(form) { submitHandler : function(form) {
//loading('onloading...'); //loading('onloading...');
var flag = true; var flag = true;
var subscribeId=0; /* var subscribeId=0;
//console.log("boxSolid:"+$(".boxSolid.hidden").length); //console.log("boxSolid:"+$(".boxSolid.hidden").length);
//console.log("hidden subscribeId:"+$(".boxSolid,.hidden").hasClass("subscribeId")); //console.log("hidden subscribeId:"+$(".boxSolid,.hidden").hasClass("subscribeId"));
//存在隐藏的subscribeId，不算进域配置 //存在隐藏的subscribeId，不算进域配置
if($(".boxSolid.hidden").hasClass("subscribeId")){ if($(".boxSolid.hidden").hasClass("subscribeId")){
subscribeId=1; subscribeId=1;
} } */
var boxSolidLenth=$(".boxSolid").length; var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){ /* if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1; boxSolidLenth=boxSolidLenth-1;
} } */
//代表所有业务都隐藏了，提示必须增加一种业务数据 //代表所有业务都隐藏了，提示必须增加一种业务数据
if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){ if(boxSolidLenth ==($(".boxSolid.hidden").length)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }