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

IP/domain intercepter增加whitelist

Browse Source 
修改配置统计界面无效的service不显示
This commit is contained in:
duandongmei
2018-07-31 11:13:11 +08:00
parent 2b8edce48f
commit 1a94c225bc
6 changed files with 71 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,30 +124,32 @@
</div>
</div>
<c:if test="${fn:length(serviceList)>1}">
<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="action" /></label>
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
serviceId="${service.serviceId }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action}">checked</c:if>>
<spring:message code="${service.actionCode }" />
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</label>
</c:forEach>
</div>
<div for="action"></div>
</div>
</div>
</div>
</c:if>
</c:forEach>
</c:if>
</label>
</c:forEach>
</div>
<div for="action"></div>
</div>
</div>
</c:if>
</div>
<div class="row">
<div class="col-md-6">

5
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -229,10 +229,11 @@
</div> --%>
<c:forEach items="${serviceList }" var="serviceDict">
<c:if test="${serviceDict.functionId== cfg.functionId}">
<c:set var="serviceName" value="${serviceDict.serviceName }"/>
<c:set var="serviceName1" value="${serviceDict.serviceName }"/>
<c:set var="action" value="${serviceDict.action }"/>
</c:if>
</c:forEach>
${serviceName1 }
<div class="theme-panel hidden-xs hidden-sm">
<c:if test="${action eq 16 }">
<c:set var="configPermissionName" value="control:httpBlock:config"/>
@@ -277,7 +278,7 @@
<h3 class="page-title">
<spring:message code="${serviceName }"></spring:message>
<spring:message code="${serviceName1 }"></spring:message>
<small><spring:message code="date_list"/></small>
</h3>
<h5 class="page-header"></h5>

52
src/main/webapp/WEB-INF/views/index.jsp
View File

@@ -95,30 +95,34 @@
</thead>
<tbody>
<c:forEach items="${configStatistics }" var="statistics" varStatus="status" step="1">
<tr>
<td>
<c:forEach items="${serviceList }" var="serviceDict" varStatus="status" step="1">
<c:if test="${serviceDict.serviceId eq statistics.service }">
<spring:message code="${serviceDict.serviceName }"/>
</c:if>
</c:forEach>
</td>
<td>
${statistics.approved }
</td>
<td>
${statistics.unapproved }
</td>
<td>
${statistics.cancle_approved }
</td>
<td>
${statistics.created }
</td>
<td>
${statistics.deleted }
</td>
</tr>
<c:set var="serviceName" value=""></c:set>
<c:forEach items="${serviceList }" var="serviceDict" varStatus="status" step="1">
<c:if test="${serviceDict.serviceId eq statistics.service }">
<c:set var="serviceName" value="${serviceDict.serviceName }"></c:set>
</c:if>
</c:forEach>
<c:if test="${!empty serviceName }">
<tr>
<td>
<spring:message code="${serviceName }"/>
</td>
<td>
${statistics.approved }
</td>
<td>
${statistics.unapproved }
</td>
<td>
${statistics.cancle_approved }
</td>
<td>
${statistics.created }
</td>
<td>
${statistics.deleted }
</td>
</tr>
</c:if>
</c:forEach>
</tbody>
</table>