From 0dd7f79af0888dd520fb3eb2a6e039e2ada44c8c Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Fri, 13 Apr 2018 13:47:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E4=B8=80=E4=BA=9B=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=202.=E6=AC=BA=E9=AA=97ip=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp |  2 +-
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index d3e4845d8..84048000d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -305,7 +305,7 @@ $(function(){
                                   <div class="col-md-6">
                                       <div class="row">
                                           <div class="col-md-offset-3 col-md-8">
-                                          	  <shiro:hasPermission name="ip:cfg:edit">
+                                          	  <shiro:hasPermission name="cfg:dnsip:edit">
                                           	  <input id="submitBtn" type="submit" class="btn btn-circle blue" value=<spring:message code="submit"></spring:message>>
 											  </shiro:hasPermission>
 											  <button id="cancel" type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index a7d4e138c..bd5115d98 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -52,9 +52,9 @@
 	function edit() {
 		var checkboxes = $(".child-checks:checked");
 		if (checkboxes.length == 0) {
-			alertx("请选择一条配置");
+			alertx("<spring:message code='one_more'/>");
 		} else if (checkboxes.length > 1) {
-			alertx("只能选择一条配置");
+			alertx("<spring:message code='check_one'/>");
 		} else {
 			window.location.href = "${ctx}/cfg/dnsIp/form?cfgId=" + checkboxes.attr("id");
 		}
@@ -63,7 +63,7 @@
 	function delCfg() {
 		var checkboxes = $(".child-checks:checked");
 		if (checkboxes.length == 0) {
-			alertx("请选择一条配置");
+			alertx("<spring:message code='one_more'/>");
 		} else {
 			var ids = "";
 			checkboxes.each(function(){
@@ -83,7 +83,7 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<shiro:hasPermission name="cfg:ip:edit">
+		<shiro:hasPermission name="cfg:dnsip:edit">
 			<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/cfg/dnsIp/form'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>
@@ -131,7 +131,7 @@
 									<%-- <button type="button" class="btn btn-default" onclick="edit()">
                                         <i class="fa fa-edit"></i> <spring:message code="edit"/>
                                     </button> --%>
-                                    <shiro:hasPermission name="cfg:ip:edit">
+                                    <shiro:hasPermission name="cfg:dnsip:edit">
                                     <button class="btn btn-default" onclick="delCfg()" data-toggle="tooltip" data-placement="top">
 										<i class="fa fa-trash"> <spring:message code="delete"/></i>
 									</button>
@@ -246,7 +246,7 @@
 						<table class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
-									<shiro:hasPermission name="cfg:ip:edit">
+									<shiro:hasPermission name="cfg:dnsip:edit">
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									</shiro:hasPermission>
 									<th><spring:message code="config_describe"/></th>
@@ -276,7 +276,7 @@
 							</thead>
 							<tbody>
 								<c:forEach items="${page.list }" var="dnsIpCfg" varStatus="status" step="1">
-									<shiro:hasPermission name="cfg:ip:edit">
+									<shiro:hasPermission name="cfg:dnsip:edit">
 									<td><input type="checkbox" class="i-checks child-checks" id="${dnsIpCfg.fakeId}" value="${dnsIpCfg.isAudit}"></td>
 									</shiro:hasPermission>
 									<td>${dnsIpCfg.cfgDesc }</td>