tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into kakaoFT

Browse Source
This commit is contained in:
rosewiper 2024-01-04 14:32:14 +09:00
commit 8b5e122f29
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -750,6 +750,8 @@ public class KakaoAlimTalkTemplateController {
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";

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

@ -732,8 +732,8 @@ $(document).on('click', '.symbolButton, .changeWord', function (){
<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 -->