From d718d4b7226a3bcb327a64dc2a295e4262a17e24 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 1 Jun 2018 11:07:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93action=E5=8F=AA=E6=9C=89=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=8F=AF=E9=80=89=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cfg/whitelist/domainForm.jsp        | 50 ++++++++++-------
 .../WEB-INF/views/cfg/whitelist/ipForm.jsp    | 53 ++++++++++++-------
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
index 42a64b92c..ca4623b9e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
@@ -94,7 +94,15 @@ $(function(){
                           <input type="hidden" name="isAreaEffective" value="0">
                           <input type="hidden" name=requestId value="0">
                           <input type="hidden" name="functionId" value="${_cfg.functionId}">
-                          <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+                          <c:if test="${fn:length(serviceList)==1}">
+			            	<c:forEach items="${serviceList}" var="service">
+                				<input type="hidden" name="action" value="${service.action }">
+			            	    <input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
+			            	</c:forEach>
+							</c:if>
+							<c:if test="${fn:length(serviceList)>1}">
+							 <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+							</c:if>
                           <div class="form-body">
                           <h3 class="form-section"><spring:message code="block_config"/></h3>
 								<div class="row">
@@ -118,25 +126,27 @@ $(function(){
 								    </div>
 								</div>
                           </div>
-                          <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 }"/>
-							                		</c:if>
-							            		</label>
-							            	</c:forEach>
-							            </div>
-							            <div for="action"></div>
-							        </div>
-							    </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 }"/>
+								                		</c:if>
+								            		</label>
+								            	</c:forEach>
+								            </div>
+								            <div for="action"></div>
+								        </div>
+								    </div>
+								</div>
+						  </c:if>
                           <div class="form-actions">
                               <div class="row">
                                   <div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index e508408a4..fe09030f3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -88,10 +88,18 @@ $(function(){
                             <input type="hidden" name="protocolId" value="${_cfg.protocolId}">
                             <input type="hidden" name=requestId value="0">
                             <input type="hidden" name="functionId" value="${_cfg.functionId}">
-                            <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
                             <input type="hidden" name="protocol" value="0">
 							<input type="hidden" name="direction" value="0">
 							<input type="hidden" name="isAreaEffective" value="0">
+							<c:if test="${fn:length(serviceList)==1}">
+			            	<c:forEach items="${serviceList}" var="service">
+                				<input type="hidden" name="action" value="${service.action }">
+			            	    <input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
+			            	</c:forEach>
+							</c:if>
+							<c:if test="${fn:length(serviceList)>1}">
+							 <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
+							</c:if>
                             <!-- 配置域类型 -->
                    			<c:forEach items="${regionList}" var="region">
 	                   			<c:if test="${_cfg.functionId eq region.functionId}">
@@ -195,25 +203,30 @@ $(function(){
 							<div class="row">
 							<button type="button" class="btn btn-red-hollow center-block" onClick="more(this);" data-click-times="0"><spring:message code="show_more"/></button>
 							</div>
-							<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 }"/>
-							                		</c:if>
-							            		</label>
-							            	</c:forEach>
-							            </div>
-							            <div for="action"></div>
-							        </div>
-							    </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:if test="${fn:length(serviceList)>1}">
+								            	<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 }"/>
+								                		</c:if>
+								            		</label>
+								            	</c:forEach>
+								            	</c:if>
+								            	
+								            </div>
+								            <div for="action"></div>
+								        </div>
+								    </div>
+								</div>
+							</c:if>
                           </div>
                           <div class="form-actions">
                               <div class="row">