From d77cb39bbcf4bc06851451bd4d75c52927af2b65 Mon Sep 17 00:00:00 2001
From: zhangwq <zhangwenqing@nismail.iie.ac.cn>
Date: Wed, 24 Oct 2018 19:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp      | 2 +-
 .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp  | 2 +-
 .../views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp      | 2 +-
 .../views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
index cbc3f1508..c2fbb37d6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -87,7 +87,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="destIpAddress"><spring:message code="ip"></spring:message></form:option>
+												<form:option value="destIpAddress"><spring:message code="server_ip"></spring:message></form:option>
 												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
index 173e3d400..303209335 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist.jsp
@@ -87,7 +87,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="destIpAddress"><spring:message code="ip"></spring:message></form:option>
+												<form:option value="destIpAddress"><spring:message code="server_ip"></spring:message></form:option>
 												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
index 3dc05567c..d4a8668de 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList.jsp
@@ -120,7 +120,7 @@
 							 			<sys:delRow url="${ctx}/manipulation/ipmulitiplex/dnatPolicyForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/manipulation/ipmulitiplex/dnatDelete?functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="dnat_policy:config">
+                               		<shiro:hasPermission name="dnat_policy:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
index 477dde3d0..f7990bd73 100644
--- a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList.jsp
@@ -120,7 +120,7 @@
 							 			<sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatPolicyForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/manipulation/ipmulitiplex/snatDelete?functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                               		<shiro:hasPermission name="snat_policy:config">
+                               		<shiro:hasPermission name="snat_policy:confirm">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>