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

Merge branch 'develop' into 'demostration_08'

Browse Source 
Develop

See merge request !3
This commit is contained in:
duandongmei
2018-08-13 10:18:14 -04:00
parent 5b58ac229e 246ee9ec9a
commit d6352b3939
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/messages/message_en.properties
View File

@@ -813,7 +813,7 @@ basic_protocol=Basic Protocol
ip_Reuse_pool_config=IP Reuseing Pool
dns_res_strategy=DNS Response Profiles
policy_number=Policy No.
policy_name=Action Parameter->Response Profile
policy_name=Response Profile
min_ttl=Minimum Active time
max_ttl=Maximum Active time
ttl_unit=Unit / second

8
src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
View File

@@ -180,7 +180,7 @@
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
<div class="col-md-6">
<label class="radio-inline">
<label class="radio-inline hidden">
<input type="radio" name="exprType" value="1" class="required"
<c:if test="${_cfg.exprType==1}">checked</c:if>
><spring:message code="and_expression"/>
@@ -200,7 +200,11 @@
<div class="col-md-6">
<select name="matchMethod" class="selectpicker select2 form-control required" >
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
<c:if test="${matchMethodC.itemCode eq 1}">
<option value="${matchMethodC.itemCode}" selected >
<spring:message code="${matchMethodC.itemValue}"/>
</option>
</c:if>
</c:forEach>
</select>
</div>

8
src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
View File

@@ -311,18 +311,18 @@
</td>
<td>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchC">
<c:if test="${cfg.exprType eq matchC.itemCode}"><spring:message code="${matchC.itemValue }"/></c:if>
<c:if test="${cfg.matchMethod eq matchC.itemCode}"><spring:message code="${matchC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="hexC">
<c:if test="${cfg.exprType eq hexC.itemCode}"><spring:message code="${hexC.itemValue }"/></c:if>
<c:if test="${cfg.isHexbin eq hexC.itemCode}"><spring:message code="${hexC.itemValue }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('WHETHER_AREA_BLOCK')}" var="areaC">
<c:if test="${cfg.exprType eq areaC.itemCode and areaC.itemValue eq 'no'}"><spring:message code="${areaC.itemValue }"/></c:if>
<c:if test="${cfg.exprType eq areaC.itemCode and areaC.itemValue eq 'yes'}">
<c:if test="${cfg.isAreaEffective eq areaC.itemCode and areaC.itemValue eq 'no'}"><spring:message code="${areaC.itemValue }"/></c:if>
<c:if test="${cfg.isAreaEffective eq areaC.itemCode and areaC.itemValue eq 'yes'}">
<a href="javascript:viewAreaInfo('${ctx }','${cfg.areaEffectiveIds }','${cfg.compileId }')" >
<spring:message code="${areaC.itemValue }"/>
</a>