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

1.修改配置列表查询缺省排序根据是否审核与有效标识字段，生效的配置排在前面；

Browse Source 
2.修改黑名单选项只有在block动作时显示，其他动作不显示该属性
This commit is contained in:
zhangwei
2018-12-23 15:44:45 +06:00
parent a0e944b2ed
commit 2564a258f2
40 changed files with 132 additions and 127 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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

3
src/main/webapp/WEB-INF/views/sys/dictForm.jsp
View File

@@ -91,6 +91,7 @@
$(obj).find(".itemCode").attr("name","dictItemList["+index+"].itemCode");
$(obj).find(".itemValue").attr("name","dictItemList["+index+"].itemValue");
$(obj).find(".itemDesc").attr("name","dictItemList["+index+"].itemDesc");
$(obj).find(".itemSort").attr("name","dictItemList["+index+"].itemSort");
$(obj).find(".itemStatus").attr("name","dictItemList["+index+"].status");
$(obj).find(".itemType").attr("name","dictItemList["+index+"].type");
@@ -180,6 +181,7 @@
<spring:message code="mark"/> <input type="text" class="itemCode" autocomplete="off"/>
<spring:message code="value"/> <input type="text" class="itemValue" autocomplete="off"/>
<spring:message code="describe"/> <input type="text" class="itemDesc" autocomplete="off"/>
<spring:message code="sort"/> <input type="text" class="itemSort" autocomplete="off"/>
<spring:message code="useable"/>
<select class="itemStatus noSelect2">
<option value="1"><spring:message code="yes"/></option>
@@ -198,6 +200,7 @@
<spring:message code="mark"/> <input type="text" class="itemCode" value="${dictItem.itemCode}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="value"/> <input type="text" class="itemValue" value="${dictItem.itemValue}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="describe"/> <input type="text" class="itemDesc" value="${dictItem.itemDesc}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="sort"/> <input type="text" class="itemSort" value="${dictItem.itemSort}" autocomplete="off" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>/>
<spring:message code="useable"/>
<select class="itemStatus noSelect2" <c:if test="${dictItem.type==0}">readonly="readonly"</c:if>>
<option value="1" <c:if test="${dictItem.status==1}">selected</c:if>><spring:message code="yes"/></option>

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

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