From 641229f7324c048f32e09012a9d686f0f7ddd54d Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 5 Jul 2023 13:40:41 +0900
Subject: [PATCH] =?UTF-8?q?jsp=20dataset=20=EC=9D=B4=EB=A6=84,=20element?=
 =?UTF-8?q?=20id=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/base/actionGroup/select-actionGroup.jsp  |  8 ++++----
 .../WEB-INF/jsp/base/authority/user-list.jsp     | 16 ++++++++--------
 src/main/webapp/resources/js/base/actionGroup.js |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/base/actionGroup/select-actionGroup.jsp b/src/main/webapp/WEB-INF/jsp/base/actionGroup/select-actionGroup.jsp
index 8f3ef6ac..bcbd16e3 100644
--- a/src/main/webapp/WEB-INF/jsp/base/actionGroup/select-actionGroup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/actionGroup/select-actionGroup.jsp
@@ -27,7 +27,7 @@
 						<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Start date: activate to sort column ascending" style="">등록일자</th>
 					</tr>
                    </thead>
-                   <tbody id="${infoPrefix}List">
+                   <tbody id="_${infoPrefix}List">
 				</tbody>
                   	<template id="${infoPrefix}Row">
                   	<tr data-key="{GRP_ID}">
@@ -78,7 +78,7 @@ ${infoPrefix}Control.onGroupListChange = obj => {
 	let trs = empty ?
 		[document.getElementById("${infoPrefix}NotFound").innerHTML] : <%-- from template#${infoPrefix}NotFound --%>
 		${infoPrefix}List.inStrings(document.getElementById("${infoPrefix}Row").innerHTML); <%-- from template#${infoPrefix}Row --%>
-	$("#${infoPrefix}List").html(trs.join());
+	$("#_${infoPrefix}List").html(trs.join());
 	$("th input[type='checkbox']").prop("checked", false);
 
 	$("#${infoPrefix}Paging").setPaging({
@@ -95,13 +95,13 @@ ${infoPrefix}Control.onCurrentGroupChange = item => {
 	if (!item) return;
 	
 	let key = item.data.GRP_ID;
-	$("#${infoPrefix}List").setCurrentRow(key);
+	$("#_${infoPrefix}List").setCurrentRow(key);
 };
 
 ${infoPrefix}Control.onGroupSelect = selected => {
 	let ${infoPrefix}List = ${infoPrefix}Control.groups.dataset;
 	let keys = selected.map(e => ${infoPrefix}List.getKey(e));
-	$("#${infoPrefix}List input[type='checkbox']").each(function() {
+	$("#_${infoPrefix}List input[type='checkbox']").each(function() {
 		let checkbox = $(this);
 		checkbox.prop("checked", keys.includes(checkbox.val()));
 	});
diff --git a/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp b/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
index a59d3e3c..a3aabbdc 100644
--- a/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
@@ -8,14 +8,14 @@
 				</div>
 				<table class="datatables-ajax table table-bordered dataTable no-footer" id="DataTables_Table_0" aria-describedby="DataTables_Table_0_info">
 					<thead>
-						<tr><th tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" style="text-align:center;"><input id="userToggler" onchange="${infoPrefix}Control.users.select(this.checked);" type="checkbox" class="form-check-input"></th>
+						<tr><th tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" style="text-align:center;"><input id="authUserToggler" onchange="${infoPrefix}Control.users.select(this.checked);" type="checkbox" class="form-check-input"></th>
 							<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Email: activate to sort column ascending" style="">사용자</th>
 							<th class="sorting" tabindex="0" aria-controls="DataTables_Table_0" rowspan="1" colspan="1" aria-label="Start date: activate to sort column ascending" style="">등록일자</th>
 						</tr>
                     </thead>
-                    <tbody id="userList">
+                    <tbody id="authUsers">
 					</tbody>
-                   	<template id="userRow">
+                   	<template id="authUserRow">
                    	<tr data-key="{AUTH_ID}-{USER_ID}">
                        <td style="text-align:center;"><input value="{AUTH_ID}-{USER_ID}" onchange="${infoPrefix}Control.users.select('{AUTH_ID}-{USER_ID}', this.checked);" type="checkbox" class="form-check-input"></td>
                        <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{USER_ACNT}</td>
@@ -57,9 +57,9 @@ ${infoPrefix}Control.onUserListChange = obj => {
 	let trs = 
 		${infoPrefix}Control.authorities.isImplicit() ? [document.getElementById("implicitActions").innerHTML.replace(/{authority}/, authority)] :
 		empty ? [document.getElementById("userNotFound").innerHTML] : <%-- from template#${infoPrefix}NotFound --%>
-		${infoPrefix}List.inStrings(document.getElementById("userRow").innerHTML); <%-- from template#${infoPrefix}Row --%>
-	$("#userList").html(trs.join());
-	$("#userToggler").prop("checked", false);
+		${infoPrefix}List.inStrings(document.getElementById("authUserRow").innerHTML); <%-- from template#${infoPrefix}Row --%>
+	$("#authUsers").html(trs.join());
+	$("#authUserToggler").prop("checked", false);
 
 	$("#userPaging").setPaging({
 		list:${infoPrefix}Control.users.dataset,
@@ -76,13 +76,13 @@ ${infoPrefix}Control.onCurrentUserChange = item => {
 	
 	let data = item.data;
 	let key = data.AUTH_ID + "-" + data.USER_ID;
-	$("#userList").setCurrentRow(key);
+	$("#authUsers").setCurrentRow(key);
 };
 
 ${infoPrefix}Control.onUserSelect = selected => {
 	let ${infoPrefix}List = ${infoPrefix}Control.users.dataset;
 	let keys = selected.map(e => ${infoPrefix}List.getKey(e));
-	$("#userList input[type='checkbox']").each(function() {
+	$("#authUsers input[type='checkbox']").each(function() {
 		let checkbox = $(this);
 		checkbox.prop("checked", keys.includes(checkbox.val()));
 	});
diff --git a/src/main/webapp/resources/js/base/actionGroup.js b/src/main/webapp/resources/js/base/actionGroup.js
index f6896e34..576847ec 100644
--- a/src/main/webapp/resources/js/base/actionGroup.js
+++ b/src/main/webapp/resources/js/base/actionGroup.js
@@ -66,6 +66,7 @@ class ActionGroupControl {
 					dialog.open({
 						title:"기능그룹 선택",
 						content:resp,
+						size: "lg",
 						getData:() => {return getSelectedActionGroup();},
 						onOK:(selected) => resolve(selected)
 					});