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

修复doBlackList命名及回显bug

Browse Source
This commit is contained in:
wangwei
2019-04-17 10:55:32 +08:00
parent 3acdae76d0
commit b8d1bd9ab9
12 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,12 +241,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

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

@@ -242,12 +242,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

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

@@ -242,12 +242,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

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

@@ -215,12 +215,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

4
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -538,12 +538,12 @@ var showHideIPSECProtocol=function(obj){
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList and not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

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

@@ -246,12 +246,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

4
src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
View File

@@ -211,12 +211,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<%-- <div class="col-md-6 doBalckList"> <%-- <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

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

@@ -223,12 +223,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<%-- <div class="col-md-6 doBalckList"> <%-- <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

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

@@ -284,12 +284,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

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

@@ -228,12 +228,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

4
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

@@ -213,12 +213,12 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6 doBalckList"> <div class="col-md-6 doBlackList">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label> <label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict"> <c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose> <c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList or not empty_cfg.doBalckList}"> <c:when test="${not empty _cfg.doBlackList and dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline"> <label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/> <input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label> </label>

4
src/main/webapp/static/global/scripts/common.js
View File

@@ -946,13 +946,13 @@ var switchAction=function(action){
$(this).removeClass("hidden"); $(this).removeClass("hidden");
$(this).removeClass("disabled"); $(this).removeClass("disabled");
}); });
$(".doBalckList").removeClass("hidden"); $(".doBlackList").removeClass("hidden");
}else{ }else{
$(".policy").find("input,select,div,button").each(function(){ $(".policy").find("input,select,div,button").each(function(){
$(this).attr("disabled","disabled"); $(this).attr("disabled","disabled");
$(this).addClass("hidden"); $(this).addClass("hidden");
}); });
$(".doBalckList").addClass("hidden"); $(".doBlackList").addClass("hidden");
} }
/*************************action切换时，隐藏白名单和drop的是否记录日志*****************************/ /*************************action切换时，隐藏白名单和drop的是否记录日志*****************************/