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

Merge branch 'devlop_urldns_common_group' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into devlop_urldns_common_group

Browse Source
This commit is contained in:
zhangdongxu
2019-02-20 16:33:31 +08:00
parent 127a281df8 ff61fa313a
commit 9b36df1a00
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

@@ -457,6 +457,8 @@ public class WebsiteController extends BaseController {
} }
} }
} }
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(12, 1);
model.addAttribute("policyGroupInfos", policyGroupInfos);// 显示分组名称 12：dns 1：有效
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
model.addAttribute("index", index); model.addAttribute("index", index);
model.addAttribute("tabList", tabList); model.addAttribute("tabList", tabList);

2
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -249,6 +249,8 @@ public class WhiteListController extends CommonController {
} }
} }
} }
List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(11, 1);
model.addAttribute("policyGroupInfos", policyGroupInfos);// 显示分组名称 11：url 1：有效
model.addAttribute("_cfg", cfg); model.addAttribute("_cfg", cfg);
model.addAttribute("index", index); model.addAttribute("index", index);
model.addAttribute("tabList", tabList); model.addAttribute("tabList", tabList);

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

@@ -364,9 +364,11 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="form-group"> <div class="form-group">
<%-- <label><spring:message code='asn_no'/>:</label> --%> <%-- <label><spring:message code='asn_no'/>:</label> --%>
<label> <label>
${_cfg.commonGroupIds} <c:forEach items="${policyGroupInfos}" var="dnsGroupInfo">
</label> <c:if test="${_cfg.commonGroupIds==dnsGroupInfo.groupId}"> ${dnsGroupInfo.groupName} </c:if>
</c:forEach>
</label>
</div> </div>
</div> </div>
</div> </div>

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

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