From 3529a1caabb0090a0cc34b2e661cfda3593906a8 Mon Sep 17 00:00:00 2001
From: mjkhan21 <mjkhan21@xit.co.kr>
Date: Wed, 12 Jun 2024 18:17:01 +0900
Subject: [PATCH] =?UTF-8?q?=ED=98=84=EC=9E=AC=20=EC=A0=91=EC=86=8D=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp |  5 ++++-
 src/main/webapp/WEB-INF/jsp/include/top.jsp         | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
index 33284e0..5fa5094 100644
--- a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp
@@ -152,8 +152,10 @@
 <script type="text/javascript">
 
 var infoPrefixFields = new FormFields("#infoPrefix-form");
+<c:if test="${!empty userInfo}">infoPrefixControl.setData([${userInfo}]);</c:if>
 
 infoPrefixControl.setInfo = obj => {
+	obj = obj || infoPrefixControl.dataset.getCurrent("item");
 	infoPrefixFields.set(infoPrefixControl, obj);
 	let create = isEmpty(obj.data.USER_ACNT);
 	$("input[name='account']").prop("readonly", !create);
@@ -177,7 +179,8 @@ infoPrefixControl.onModify = (changed) => {
 	if (["USER_NM", "EML_ADRS", "MBL_TELNO"].filter(e => changed.includes(e)).length < 1)
 		return;
 	
-	renderinfoPrefixList();
+	if (window.renderinfoPrefixList)
+		renderinfoPrefixList();
 	infoPrefixControl.dataset.setState();
 }
 
diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp
index 545067e..11289bd 100644
--- a/src/main/webapp/WEB-INF/jsp/include/top.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp
@@ -30,7 +30,7 @@
 			<a class="nav-link dropdown-toggle hide-arrow show">${currentUser.name}</a>
 		</div>
 		<ul class="dropdown-menu dropdown-menu-end" data-bs-popper="static">
-			<li><a class="dropdown-item" href="pages-account-settings-account.html">
+			<li><a class="dropdown-item" onclick="currentUserInfo()">
 					<div class="d-flex">
 						<div class="flex-shrink-0 me-3">
 							<div class="avatar">
@@ -63,6 +63,14 @@
 <%--/ Navbar --%>
 <c:set var="functions" scope="request">
 ${functions}
+var currentUserControl = new UserControl();
+currentUserControl.prefix = "currentUser";
+
+function currentUserInfo() {
+	currentUserControl.dataset.clear();
+	currentUserControl.getInfo({userID: '${currentUser.id}'});
+}
+
 function setPageTitle(pageTitle) {
 	$("#pageTitle").html(pageTitle);
 }