Merge remote-tracking branch 'origin/main'

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();
 }
 

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);
 }