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

dns/url公共分组中取表policy_group_info的组id由groupId改为serviceGroupId

Browse Source 
(cherry picked from commit 31edf93fdc)
This commit is contained in:
zhanghongqing
2019-02-21 07:35:29 +00:00
committed by 董晓燕
parent 0e49a1d0ac
commit 6968a27bff
4 changed files with 4 additions and 4 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}" <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}">selected</c:if>>${dnsGroupInfo.groupName}</option>
<option value="${dnsGroupInfo.serviceGroupId}" <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}">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}" <c:if test="${_cfg.commonGroupIds==urlGroupInfo.groupId}">selected</c:if> >${urlGroupInfo.groupName}</option>
<option value="${urlGroupInfo.serviceGroupId}" <c:if test="${_cfg.commonGroupIds==urlGroupInfo.serviceGroupId}">selected</c:if> >${urlGroupInfo.groupName}</option>
</c:forEach>
</select>
</div>

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

@@ -366,7 +366,7 @@
<%-- <label><spring:message code='asn_no'/>:</label> --%>
<label>
<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
<c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if>
<c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}"> ${dnsGroupInfo.groupName} </c:if>
</c:forEach>
</label>
</div>

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

@@ -361,7 +361,7 @@
<%-- <label><spring:message code='asn_no'/>:</label> --%>
<label>
<c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
<c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if>
<c:if test="${_cfg.commonGroupIds==dnsGroupInfo.serviceGroupId}"> ${dnsGroupInfo.groupName} </c:if>
</c:forEach>
</label>
</div>