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

회원탈퇴 섹션영역

@@ -85,7 +93,7 @@ function deleteMembership()
- +
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp index d56652d4..9ecab863 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp @@ -42,14 +42,6 @@ $(document).ready(function() { %> $("[id^='mobileSuc']").css("display","inline-block"); $("[id^='emailSuc']").css("display","inline-block"); - <% - // sns연동이 하나일때 연결해제버튼 제거 - %> - if($("inputinput[name='unlinkBtn']").length==1) - { - $("input[name='unlinkBtn']").remove(); - }; - <% //새비밀번호,새비밀번호확인이 일치하는지 확인 %> @@ -580,11 +572,11 @@ function snsUnlink(snsId){ data : {mbSnsId:snsId}, success : function(result){ alert("연동이 해지되었습니다."); - $("#sns_"+snsId).remove(); - if($("input[name='unlinkBtn']").length==1) - { - $("input[name='unlinkBtn']").remove(); - }; + $("#sns_" + snsId).remove(); + if($("button[name='unlinkBtn']").length==1) + { + $("button[name='unlinkBtn']").remove(); + }; },error : function(){ } }) @@ -620,8 +612,8 @@ function snsUnlink(snsId){ - - + + " > @@ -716,7 +708,7 @@ function snsUnlink(snsId){
-
"> +
">
로고 연결완료