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

IP REUSE POLICY Group Name修改为Group 非空

Browse Source 
字典标识删除失败bug更改
This commit is contained in:
duandongmei
2018-07-30 16:36:29 +08:00
parent 4614cc004c
commit 1e864b761f
6 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
View File

@@ -166,10 +166,11 @@ $(function(){
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
<div class="col-md-6">
<select id="dnsStrategyId" name="dnsStrategyId" class="selectpicker show-tick form-control required">
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="" <c:if test="${empty _cfg.dnsStrategyId }">selected</c:if>><spring:message code="select"/></option>
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.dnsStrategyId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
</select>

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

@@ -296,7 +296,7 @@
<th exportColumn="whether_area_block"><spring:message code="whether_area_block"/></th>
</c:if>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
<th exportColumn="group_name"><spring:message code="group_name"/></th>
<th exportColumn="group_name"><spring:message code="group"/></th>
<th exportColumn="ir_type"><spring:message code="ir_type"/></th>
</c:if>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipratelimit'}">

4
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
View File

@@ -90,7 +90,7 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
<form:option value="groupName"><spring:message code="group_name"></spring:message></form:option>
<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
</form:select>
</div>
@@ -262,7 +262,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<%-- <th><spring:message code="seq"/></th> --%>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="group_name"/></th>
<th><spring:message code="group"/></th>
<th><spring:message code="ip"/></th>
<th><spring:message code="port"/></th>
<%-- <th><spring:message code="protocol"/></th>

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

@@ -41,7 +41,6 @@
},
submitHandler: function(form){
if(!validateItem()) {
return false;
}