diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java index a00563a1..77cf671d 100644 --- a/src/main/java/nlib/user/web/MemberController.java +++ b/src/main/java/nlib/user/web/MemberController.java @@ -746,7 +746,6 @@ public class MemberController extends NlibCommonController{ loginVO.setEmail(StringUtil.maskEmail(loginVO.getEmail())); loginVO.setName(StringUtil.maskName(loginVO.getName())); model.addAttribute("loginVO",loginVO); - model.addAttribute("myPageUri",myPageUri); return "nlib/member/deleteMembershipForm"; } diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index 0977230e..bba515e2 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -147,7 +147,7 @@ public class UserInfoController extends NlibCommonController { vo.setPassword(encodedText); //암호화된 패스워드 비교 - if(loginVO.getPassword().equals(vo.getPassword())) { + if(loginVO.getPassword().equals(vo.getPassword()) || vo.getPreviousPage().equals("deleteMembershipForm")) { model.addAttribute("loginVO",loginVO); model.addAttribute("snsList",snsList); return "nlib/userInfo/putMyInfo"; diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/deleteMembershipForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/deleteMembershipForm.jsp index a9bbaaa3..8f1acc58 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/deleteMembershipForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/deleteMembershipForm.jsp @@ -57,8 +57,16 @@ function deleteMembership() } }) } + +function deleteCancle() +{ + document.deleteMembershipForm.action="${pageContext.request.contextPath}/userInfo/putMyInfo.do"; + document.deleteMembershipForm.submit(); + +}