diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index a6341eeba..ad428df0a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -403,7 +403,7 @@
-
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index b4f203932..15c40f50e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -99,7 +99,7 @@
-
+
@@ -441,7 +441,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 7424452e2..0d5ce4024 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -410,7 +410,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 50accad77..472763dab 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -325,7 +325,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
index 0587bc18b..1e4b564f1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
@@ -412,7 +412,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index 9daad0873..35cd55091 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -424,7 +424,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index 3272f4721..f9e2a7c9a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -333,7 +333,7 @@
-
|
+
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
index 8ddeef599..378e36383 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -385,7 +385,7 @@
|
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index 7a7fe8d80..ad10e8185 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -424,7 +424,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 47a5ed4d8..9b43274e0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -334,7 +334,7 @@
-
|
+
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 1fb9b2e32..813c5809d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -387,7 +387,7 @@
|
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
index e52212c12..5ea0ea20c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
@@ -658,7 +658,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index 220986840..3b1ce06e3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -725,7 +725,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 3c0f67483..7f6a2efd9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -447,7 +447,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
index 954cf7777..75d8e2d33 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
@@ -9,6 +9,11 @@ $(function(){
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
}
+ var action=$(".action:checked");
+ if(!action){
+ action=$("input[name='action']");
+ }
+ var regionCode=action.attr("regionCode");
//initCommIpVal();
var serviceType=$("input[name='cfgRegionCode']").attr("serviceType");
if(serviceType){
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index dbcaaf6a9..bc4c1be46 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -537,7 +537,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index 16c72fcca..141aa2273 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -430,7 +430,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index e4e22b792..b57887aaa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -405,7 +405,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 60311ce00..fc35ae60a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -447,7 +447,7 @@
-
|
+
|
${cfg.creatorName } |
|
${cfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index cd699b878..83ea33699 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -446,7 +446,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index 68870ed99..b06027058 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -435,7 +435,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index e5a0e0d68..04d8eafa3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -424,7 +424,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index 1c15a5e45..ff89ae68f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -467,7 +467,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index b013ce3c7..4c867d1a2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -430,7 +430,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index a9f3390a2..8e7e00ab9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -431,7 +431,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 82353e08a..2e6a03a26 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -433,7 +433,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index 297137cae..8546cb30a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -692,7 +692,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
index 75837244e..559ab71c0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -321,7 +321,7 @@
-
|
+
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
index 164d36ff2..18c8350f4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -322,7 +322,7 @@
|
-
|
+
|
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index f3dd01911..e5425739f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -436,7 +436,7 @@
|
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 7bad1eed4..2ea06613b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -586,7 +586,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 300b2d9aa..f75d4bb41 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -430,7 +430,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index c05c55378..2d9a2c93f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -430,7 +430,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index eae562de0..64945cc5d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -430,7 +430,7 @@
-
|
+
|
${indexCfg.creatorName } |
|
${indexCfg.editorName } |
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index f175ef565..7472a716c 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -82,6 +82,7 @@
$(this).find("[name='parent.specServiceId']").removeAttr("name");
$(this).find("[name='parent.specServiceName']").removeAttr("name");
$(this).find("[name='businessType']").removeAttr("name");
+ $(this).find("[name='specServiceCode']").removeAttr("name");
}else{
var cfgType=$(this).attr("cfgType");
if("${specificServiceCfg.parent.specServiceId}"&& "${specificServiceCfg.parent.specServiceId}"!="0"){
@@ -91,7 +92,7 @@
}
}
});
- $(".protocol_code").html('
*:');
+ //$(".protocol_code").html('
*:');
$(".protocol_name").html('
*:');
$(".protocol_desc").html('
:');
}else{
@@ -101,6 +102,7 @@
$(this).find("[name='parent.specServiceId']").removeAttr("name");
$(this).find("[name='parent.specServiceName']").removeAttr("name");
$(this).find("[name='businessType']").removeAttr("name");
+ $(this).find("[name='specServiceCode']").removeAttr("name");
}else{
var cfgType=$(this).attr("cfgType");
if("${specificServiceCfg.parent.specServiceId}"&& "${specificServiceCfg.parent.specServiceId}"!="0"){
@@ -112,15 +114,15 @@
}
});
if($("[name='cfgType']").val()==1){
- $(".protocol_code").html('
*:');
+ //$(".protocol_code").html('
*:');
$(".protocol_name").html('
*:');
$(".protocol_desc").html('
:');
}else if($("[name='cfgType']").val()==2){
- $(".protocol_code").html('
*:');
+ //$(".protocol_code").html('
*:');
$(".protocol_name").html('
*:');
$(".protocol_desc").html('
:');
}else{
- $(".protocol_code").html('
*:');
+ //$(".protocol_code").html('
*:');
$(".protocol_name").html('
*:');
$(".protocol_desc").html('
:');
}
@@ -133,6 +135,7 @@
$("#specificServiceCfg"+cfgType+"Id").attr("name","parent.specServiceId");
$("#specificServiceCfg"+cfgType+"Name").attr("name","parent.specServiceName");
$("#businessType"+cfgType).attr("name","businessType");
+ $("#specServiceCode"+cfgType).attr("name","specServiceCode");
if($(this).hasClass("businessType")){
var parentId=$("#specificServiceCfg"+cfgType+"Id").val();
if(parentId!=0){
@@ -152,15 +155,15 @@
}
});
if(cfgType==1){
- $(".protocol_code").html('
*:');
+ //$(".protocol_code").html('
*:');
$(".protocol_name").html('
*:');
$(".protocol_desc").html('
:');
}else if(cfgType==2){
- $(".protocol_code").html('
*:');
+ //$(".protocol_code").html('
*:');
$(".protocol_name").html('
*:');
$(".protocol_desc").html('
:');
}else{
- $(".protocol_code").html('
*:');
+ //$(".protocol_code").html('
*:');
$(".protocol_name").html('
*:');
$(".protocol_desc").html('
:');
}
@@ -278,6 +281,33 @@
+