Commit @8b5e122f29cb2f189d662f288a0fdaad6b4fd7f2

rosewiper 2024-01-04

Merge branch 'master' into kakaoFT

@8b5e122f29cb2f189d662f288a0fdaad6b4fd7f2

762de30

8b5e122

src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java

--- src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java


 			LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
 			String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
 			
+			model.addAttribute("loginVO", loginVO);
+			
 			if(userId == "") {
 				model.addAttribute("message", "로그인 후 이용이 가능합니다.");
 				return "redirect:/web/user/login/login.do";

762de30

8b5e122

src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateDetail.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateDetail.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/at/KakaoAlimtalkTemplateDetail.jsp


         <div class="top_content kakaotalkset_cont current pay_tab_wrap">
             <div class="heading">
                 <h2>카카오톡 설정</h2>
-                <button type="button" class="button info"
-                    onclick="window.open('popup_kakaoset_template.html','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button>
+                <%-- <button type="button" class="button info" onclick="window.open('popup_kakaoset_template.html','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button> --%>
+                <button type="button" class="button info" onclick="window.open('/web/pop/kakaoTemplatePop.do','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button>
             </div>
             <div class="list_tab_wrap2 type2 ">
                 <!-- tab button -->

Add a comment

Open 0
Closed 0

List

...	...	@@ -750,6 +750,8 @@
750	750	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
751	751	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
752	752
	753	+ model.addAttribute("loginVO", loginVO);
	754	+
753	755	if(userId == "") {
754	756	model.addAttribute("message", "로그인 후 이용이 가능합니다.");
755	757	return "redirect:/web/user/login/login.do";

...	...	@@ -732,8 +732,8 @@
732	732	<div class="top_content kakaotalkset_cont current pay_tab_wrap">
733	733	<div class="heading">
734	734	<h2>카카오톡 설정</h2>
735		- <button type="button" class="button info"
736		- onclick="window.open('popup_kakaoset_template.html','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button>
	735	+ <%-- <button type="button" class="button info" onclick="window.open('popup_kakaoset_template.html','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button> --%>
	736	+ <button type="button" class="button info" onclick="window.open('/web/pop/kakaoTemplatePop.do','_blank','width=790, height=300, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=yes')">사용안내</button>
737	737	</div>
738	738	<div class="list_tab_wrap2 type2 ">
739	739	<!-- tab button -->

Delete comment