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

1、协议中菜单dns增加公共组配置，同时修改审核，取消审核公共组部分，并且界面回显展示组号。

Browse Source 
2、协议菜单中http url 增加公共组配置，同时修改审核，取消审核公共组部分，并且界面回显展示组号。
This commit is contained in:
zhanghongqing
2019-02-18 17:51:00 +08:00
parent 8194fb290c
commit d1f64348f4
10 changed files with 95 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp
View File

@@ -53,7 +53,7 @@
<select name="commonGroupIds" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
<option value="${dnsGroupInfo.groupId}">${dnsGroupInfo.groupName}</option>
<option value="${dnsGroupInfo.groupId}" <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}">selected</c:if>>${dnsGroupInfo.groupName}</option>
</c:forEach>
</select>
</div>

2
src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp
View File

@@ -53,7 +53,7 @@
<select name="commonGroupIds" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
<option value="${urlGroupInfo.groupId}">${urlGroupInfo.groupName}</option>
<option value="${urlGroupInfo.groupId}" <c:if test="${_cfg.commonGroupIds==urlGroupInfo.groupId}">selected</c:if> >${urlGroupInfo.groupName}</option>
</c:forEach>
</select>
</div>

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

@@ -13,6 +13,10 @@
$(document)
.ready(
function() {
// 修改dns公共组时回显用
if($("select[name$='commonGroupIds']").val()){
addContent($(".dnsGroupAdd"),'dnsGroup');
}
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));

22
src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
View File

@@ -25,6 +25,13 @@
<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
</div>
</c:if>
<c:if test="${not empty _cfg.commonGroupIds }">
<div id="NTC_DNS_REGIONTitle${index}" onclick="switchSubCfgTabInfo('NTC_DNS_REGION',${index})"
class="col-md-1 tabInfo" name="tabTitle${index }">
<spring:message code='dnsGroup' />
<i id="NTC_DNS_REGION${index}" class="fa" name="tabFlag${index}"></i>
</div>
</c:if>
</div>
<c:forEach items="${tabList}" var="region">
<c:if test="${region[0] eq 1 }">
@@ -350,4 +357,19 @@
<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
</div>
</c:if>
<!-- 显示 公共组信息 -->
<c:if test="${not empty _cfg.commonGroupIds }">
<div id="NTC_DNS_REGIONInfo${index}" class="content" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">
<%-- <label><spring:message code='asn_no'/>:</label> --%>
<label>
${_cfg.commonGroupIds}
</label>
</div>
</div>
</div>
</div>
</c:if>
</html>

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

@@ -13,6 +13,11 @@
$(document)
.ready(
function() {
// 修改url公共组时回显用
if($("select[name$='commonGroupIds']").val()){
addContent($(".urlGroupAdd"),'urlGroup');
}
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));

22
src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
View File

@@ -25,6 +25,13 @@
<i id="schedule${index}" class="fa" name="tabFlag${index}"></i>
</div>
</c:if>
<c:if test="${not empty _cfg.commonGroupIds }">
<div id="NTC_URL_REGIONTitle${index}" onclick="switchSubCfgTabInfo('NTC_URL_REGION',${index})"
class="col-md-1 tabInfo" name="tabTitle${index }">
<spring:message code='urlGroup' />
<i id="NTC_URL_REGION${index}" class="fa" name="tabFlag${index}"></i>
</div>
</c:if>
</div>
<c:forEach items="${tabList}" var="region">
<c:if test="${region[0] eq 1 }">
@@ -345,4 +352,19 @@
<%@include file="/WEB-INF/include/form/scheduleNewSubList.jsp"%>
</div>
</c:if>
<!-- 显示 公共组信息 -->
<c:if test="${not empty _cfg.commonGroupIds }">
<div id="NTC_URL_REGIONInfo${index}" class="content" name="subCfg${index}">
<div class="row">
<div class="col-md-4">
<div class="form-group">
<%-- <label><spring:message code='asn_no'/>:</label> --%>
<label>
${_cfg.commonGroupIds}
</label>
</div>
</div>
</div>
</div>
</c:if>
</html>