From 979ef742593c089a346bef44b8f51349615a7b0d Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 31 Aug 2018 09:33:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?asn=20ip=20=E9=85=8D=E7=BD=AE=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=8A=A0=E5=85=A5asn=20ip=E7=BB=84=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/basics/AsnIpController.java | 2 ++ src/main/resources/messages/message_en.properties | 3 ++- .../resources/messages/message_zh_CN.properties | 3 ++- .../webapp/WEB-INF/views/basics/asnIpCfgList.jsp | 14 +++++++++++--- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/nis/web/controller/basics/AsnIpController.java b/src/main/java/com/nis/web/controller/basics/AsnIpController.java index 6e9db0acf..92b7c0358 100644 --- a/src/main/java/com/nis/web/controller/basics/AsnIpController.java +++ b/src/main/java/com/nis/web/controller/basics/AsnIpController.java @@ -32,6 +32,8 @@ public class AsnIpController extends BaseController{ Page page = asnIpCfgService.findPage(new Page(request, response,"r"), entity); model.addAttribute("page", page); initPageCondition(model); + List policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(4); + model.addAttribute("policyGroups", policyGroups); return "/basics/asnIpCfgList"; } @RequestMapping(value = {"/addForm"}) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 30ebb3f3d..839e9c313 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1136,4 +1136,5 @@ app_header_feature_monit=APP Header Feature Monitoring can_not_edit_issued_ans_ip=Can not edit issued ASN IP is_issued=Is Issued asn_ip_configuration=ASN IP Configuration -asn_policy=ASN Policy \ No newline at end of file +asn_policy=ASN Policy +asn_ip_group=ASN IP Group \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 60ba0c1cb..e17389a31 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1133,4 +1133,5 @@ app_header_feature_monit=APP\u5C42\u5934\u7279\u5F81\u76D1\u6D4B can_not_edit_issued_ans_ip=\u4E0D\u80FD\u4FEE\u6539\u5DF2\u7ECF\u4E0B\u53D1\u8FC7\u7684ASN IP is_issued=\u662F\u5426\u4E0B\u53D1 asn_ip_configuration=ASN IP\u914D\u7F6E -asn_policy=ASN\u7B56\u7565 \ No newline at end of file +asn_policy=ASN\u7B56\u7565 +asn_ip_group=ASN IP\u7EC4 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp index a68ebe976..51a67c0c5 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp @@ -85,15 +85,23 @@
- <%-- + + + + + + +
+ <%--
+ - --%> -
+ +
--%>
From 48f873ff145700bd2b3aabb6e53a9b92e9d8e65e Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 31 Aug 2018 11:09:10 +0800 Subject: [PATCH 2/5] =?UTF-8?q?asn=20=E7=AD=96=E7=95=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BB=84=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp index a5b8bd2b1..167f7c267 100644 --- a/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp @@ -246,7 +246,7 @@ - + <%-- From 55d90c1b734a14372d727f061c2616f6bd5084fd Mon Sep 17 00:00:00 2001 From: leijun Date: Fri, 31 Aug 2018 11:21:05 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97APP?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=20=20=E6=A0=87=E9=A2=98=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 3733750b0..64f73d88a 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -38,7 +38,7 @@ $(document).ready(function(){ - + From 4393f94a5a1697f9068014db8d6e758e351ca86d Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 31 Aug 2018 11:26:12 +0800 Subject: [PATCH 4/5] =?UTF-8?q?ans=20ip=20=E7=95=8C=E9=9D=A2=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=B1=95=E5=BC=80=E4=B8=80=E4=B8=AAip,=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E5=BF=85=E9=A1=BB=E4=BF=9D=E7=95=99=E4=B8=80=E4=B8=AA?= =?UTF-8?q?IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp index a6e6367ed..d3eaa4bd9 100644 --- a/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp +++ b/src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp @@ -7,6 +7,7 @@ var defaultIpInfo; $(function(){ defaultIpInfo=$(".ipInfo").clone(); + $(".asnIpAdd").click(); $("#cfgFrom").validate({ errorPlacement: function(error,element){ $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error); @@ -40,6 +41,10 @@ var addContent = function(obj, contentClassName) { //业务窗口关闭 var delContent = function(obj,contentClassName) { + if($("."+contentClassName).length==1){ + top.$.jBox.tip(""); + return; + } $(obj).parents("."+contentClassName).remove(); var index=0; $("."+contentClassName).each(function(){ From d79eea48770d1c8624bacf39843dd0b171b3664d Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Fri, 31 Aug 2018 11:43:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?1.=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=202.=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=80=BB=E9=87=8F=E5=88=97=E4=B8=BA0=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp | 4 ++-- .../webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp | 4 ++-- .../webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 4 ++-- .../webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp | 4 ++-- .../WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp | 4 ++-- .../webapp/WEB-INF/views/cfg/intercept/interceptList.jsp | 4 ++-- .../webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp | 4 ++-- .../WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp | 4 ++-- .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp | 4 ++-- .../WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp | 4 ++-- .../WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp | 4 ++-- .../WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp | 4 ++-- .../webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp | 4 ++-- src/main/webapp/static/global/scripts/common.js | 6 +++++- 35 files changed, 73 insertions(+), 69 deletions(-) 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 733bf3312..7d91e613d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp @@ -187,7 +187,7 @@
- + @@ -202,7 +202,7 @@
- + 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 9e53984e5..808cde1f7 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 @@ -153,7 +153,7 @@
- + @@ -168,7 +168,7 @@
- + 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 76cc73130..03303c732 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 @@ -150,7 +150,7 @@
- + @@ -165,7 +165,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 2f4971c45..654c258b0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp @@ -145,7 +145,7 @@
- + @@ -160,7 +160,7 @@
- + 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 af502f90f..fbf33f3e5 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 @@ -153,7 +153,7 @@
- + @@ -168,7 +168,7 @@
- + 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 9ce9b1369..447099bcd 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 @@ -151,7 +151,7 @@
- + @@ -166,7 +166,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 d5f6043de..3c6244040 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp @@ -153,7 +153,7 @@
- + @@ -168,7 +168,7 @@
- + 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 371f129bd..d853a5585 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 @@ -507,7 +507,7 @@
- + @@ -522,7 +522,7 @@
- + 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 6dbf952b3..b593de426 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 @@ -520,7 +520,7 @@
- + @@ -535,7 +535,7 @@
- + 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 2fe6b3589..14413be11 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp @@ -194,7 +194,7 @@
- + @@ -209,7 +209,7 @@
- + 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 1685d94f7..1c46c865c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -208,7 +208,7 @@
- + @@ -223,7 +223,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp index 927fe7b73..11926a655 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp @@ -156,7 +156,7 @@
- + @@ -171,7 +171,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp index 2750f0f05..01e62f164 100644 --- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp @@ -149,7 +149,7 @@
- + @@ -164,7 +164,7 @@
- + 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 9c1e7f104..f25295cd8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp @@ -194,7 +194,7 @@
- + @@ -209,7 +209,7 @@
- + 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 2e108d482..001e23eb2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp @@ -182,7 +182,7 @@
- + @@ -197,7 +197,7 @@
- + 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 2f6a81254..034902ee2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp @@ -188,7 +188,7 @@
- + @@ -203,7 +203,7 @@
- + 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 0210bb648..a6a5feca6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp @@ -179,7 +179,7 @@
- + @@ -194,7 +194,7 @@
- + 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 31688ca5c..f18855f46 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -190,7 +190,7 @@
- + @@ -205,7 +205,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp index f9427c543..a05a8b62c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp @@ -130,7 +130,7 @@
- + @@ -145,7 +145,7 @@
- + 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 846eea053..979b43119 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp @@ -183,7 +183,7 @@
- + @@ -198,7 +198,7 @@
- + 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 78d451074..48ddafddb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp @@ -184,7 +184,7 @@
- + @@ -199,7 +199,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp index 57ac025c9..dc0f8e3e7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp @@ -133,7 +133,7 @@
- + @@ -148,7 +148,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp index 1ddf55a2b..8a33a61d6 100644 --- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp @@ -136,7 +136,7 @@
- + @@ -151,7 +151,7 @@
- + 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 ed1976460..99ea38e2f 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp @@ -185,7 +185,7 @@
- + @@ -200,7 +200,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp index 7e7874be3..2412312ec 100644 --- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp @@ -185,7 +185,7 @@
- + @@ -200,7 +200,7 @@
- + 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 339077bef..eadde6422 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 @@ -373,7 +373,7 @@
- + @@ -388,7 +388,7 @@
- + 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 d03d107e7..35fd7e4bf 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 @@ -130,7 +130,7 @@
- + @@ -145,7 +145,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 57e8026c1..80c2101e3 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 @@ -131,7 +131,7 @@
- + @@ -146,7 +146,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp index badb053db..fc3ae126d 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp @@ -137,7 +137,7 @@
- + @@ -152,7 +152,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 eb5a50454..7de91889a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp @@ -183,7 +183,7 @@
- + @@ -198,7 +198,7 @@
- + 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 6a9c7a344..7944d51e1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp @@ -341,7 +341,7 @@
- + @@ -356,7 +356,7 @@
- + 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 0b9b0e617..c4595b269 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -183,7 +183,7 @@
- + @@ -198,7 +198,7 @@
- + 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 15abd71a4..16df2b1a0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp @@ -183,7 +183,7 @@
- + @@ -198,7 +198,7 @@
- + 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 680324c4f..bd5ea8fbe 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp @@ -183,7 +183,7 @@
- + @@ -198,7 +198,7 @@
- + diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 8637698cc..dec0bfd5b 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1277,7 +1277,11 @@ var GetLogTotal=function(_data){ for(var i=0;i"+data[i].sum+""); + if(data[i].sum != 0){ + $(this).html(""+data[i].sum+""); + }else{ + $(this).html(data[i].sum); + } } } })