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

1、修改http_ip配置的ip地址类型，使用字典；2、httpSubList.jsp排除decorator装饰，以解决审核按钮的data-toggle多次触发，下拉按钮不显示的问题。

Browse Source
This commit is contained in:
zhangwei
2018-05-29 17:35:19 +08:00
parent 180959270c
commit 988f31f136
4 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/webapp/WEB-INF/sitemesh3.xml
View File

@@ -20,6 +20,7 @@
<!-- 排除，不进行装饰的路径 -->
<mapping path="/javadoc/*" exclue="true"/>
<mapping path="/brochures/*" exclue="true"/>
<mapping path="/nis/ntc/website/ajaxHttpSubList" exclue="true"/>
<!-- 对同一路径，启用多个装饰器 -->
<mapping>

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

@@ -32,9 +32,11 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}[${status.index }].ipType"
class="selectpicker show-tick form-control required">
<option value="4"
<c:if test="${ipPort.ipType==4 || ipPort.ipType==null }">selected</c:if>>V4</option>
<option value="6" <c:if test="${ipPort.ipType==6}">selected</c:if>>V6</option>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<option value="${ipType.itemCode}" <c:if test="${ipPort.ipType==ipType.itemCode}">selected</c:if> >
${ipType.itemValue}
</option>
</c:forEach>
</select>
</div>
<div for="${cfgName}[${status.index }].ipType"></div>

19
src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
View File

@@ -3,23 +3,7 @@
<html>
<head>
<title><spring:message code="${cfgName}"></spring:message></title>
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<link href="${pageContext.request.contextPath}/static/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
<c:choose>
<c:when test="${cookie.Language.value eq 'zh_CN'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'en'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'ru_RU'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
</c:when>
<c:otherwise>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:otherwise>
</c:choose>
<script>
$(document).ready(function() {
//搜索框提示语初始化
@@ -47,7 +31,6 @@
$("#level").attr("value",'');
$("#searchForm")[0].reset();
});
//异步获取voip相关信息
$("span[id^=open]").click(function(){
var openId=$(this).attr("id");

9
src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
View File

@@ -89,10 +89,11 @@
<div class="form-group">
<label><spring:message code='ip_type'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.ipType eq 4}">V4</c:when>
<c:when test="${cfg.ipType eq 6}">V6</c:when>
</c:choose>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<c:if test="${cfg.ipType==ipType.itemCode}">
${ipType.itemValue}
</c:if>
</c:forEach>
</label>
</div>
</div>