From a4233ea1da845890c7a7be6ed38073e4c079c730 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Fri, 9 Jun 2023 13:06:21 +0900 Subject: [PATCH] =?UTF-8?q?=ED=83=80=EC=9D=BC=EC=A6=88=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 - pom.xml | 50 +--- .../ens/adm/web/SendRqstMngController.java | 4 +- .../web/StatsBySignTalkByYearController.java | 2 +- .../biz/cmm/web/FrameworkCmmController.java | 6 +- .../cmm/web/XitFrameAnonymousController.java | 16 +- .../biz/cmm/web/XitFrameFileController.java | 24 +- .../biz/cmm/web/XitFramePopupController.java | 6 +- .../biz/cmm/web/XitLoginController.java | 14 +- .../web/XitAdminServerCmdMngController.java | 16 +- .../web/XitAdminServerFileMngController.java | 15 +- .../web/XitAdminServerLogMngController.java | 14 +- .../web/XitConectionLogMngController.java | 10 +- .../web/XitConectionStatsMngController.java | 10 +- .../auth/web/XitLoginPolicyMngController.java | 12 +- .../mng/bbs/web/XitBasicBbsMngController.java | 19 +- .../bbs/web/XitBbsCreateMngController.java | 12 +- .../bbs/web/XitBbsTmplateMngController.java | 16 +- .../mng/bbs/web/XitBbsUseMngController.java | 13 +- .../biz/mng/user/web/UserMgtController.java | 4 +- .../user/web/XitUserAbsntMngController.java | 13 +- .../user/web/XitUserEtcOptMngController.java | 13 +- .../core/constants/FrameworkConstants.java | 27 +-- .../core/interceptor/MenuIntercepter.java | 68 +++--- .../resources/spring/context-resolver.xml | 132 ----------- .../resources/spring/dispatcher-servlet.xml | 56 +++-- .../template/tiles/layout-tiles-defs.xml | 213 ------------------ .../biz/mng/admin/XitConectionLogMng_list.jsp | 4 +- .../mng/admin/XitConectionStatsMng_list.jsp | 8 +- .../admin/backup/XitConectionLogMng_list2.jsp | 2 +- .../mng/auth/backup/XitAuthGrpMng_list.jsp | 4 +- .../auth/backup/XitAuthHierarchyMng_list.jsp | 4 +- .../mng/auth/backup/XitAuthRegMng_list.jsp | 4 +- .../mng/auth/backup/XitAuthRuleMng_list.jsp | 4 +- .../mng/auth/backup/XitAuthUsrMng_list.jsp | 4 +- .../biz/mng/auth/loginPolicyMng_edit.jsp | 47 +--- .../biz/mng/auth/loginPolicyMng_input.jsp | 30 +-- .../biz/mng/auth/loginPolicyMng_list.jsp | 4 +- .../biz/mng/bbs/XitBasicBbsMng_edit.jsp | 26 +-- .../biz/mng/bbs/XitBasicBbsMng_input.jsp | 26 +-- .../biz/mng/bbs/XitBasicBbsMng_inputReply.jsp | 26 +-- .../biz/mng/bbs/XitBasicBbsMng_list.jsp | 4 +- .../biz/mng/bbs/XitBasicBbsMng_view.jsp | 26 +-- .../biz/mng/bbs/XitBbsCreateMng_list.jsp | 4 +- .../biz/mng/bbs/XitBbsTmplateMng_edit.jsp | 2 +- .../biz/mng/bbs/XitBbsTmplateMng_input.jsp | 2 +- .../biz/mng/bbs/XitBbsTmplateMng_list.jsp | 3 +- .../biz/mng/bbs/XitBbsUseMng_edit.jsp | 2 +- .../mng/bbs/backup/XitBbsTmplateMng_edit.jsp | 2 +- .../biz/mng/bbs/mngBoardTmplPreviewPopup.jsp | 4 +- .../biz/mng/bbs/mngBoardUseMgtPopup.jsp | 2 +- .../biz/mng/code/backup/XitClCodeMng_list.jsp | 4 +- .../mng/code/backup/XitCmmnCodeMng_list.jsp | 4 +- .../mng/code/backup/XitDetailCodeMng_list.jsp | 4 +- .../menu/backup/XitMenuCreateMng_list2.jsp | 5 +- .../biz/mng/usr/XitUserAbsntMng_list.jsp | 4 +- .../biz/mng/usr/XitUserEtcOptMng_list.jsp | 4 +- .../mng/usr/XitUserRegMng_editPwd_popup.jsp | 2 +- .../mng/usr/backup/XitUserRegMng_editPwd.jsp | 2 +- .../biz/mng/usr/backup/XitUserRegMng_view.jsp | 1 - ...les-biz-inner.jsp => layout-biz-inner.jsp} | 2 +- ...t-tiles-biz-org.jsp => layout-biz-org.jsp} | 2 +- ...t-tiles-biz-pop.jsp => layout-biz-pop.jsp} | 2 +- ...tiles-biz-root.jsp => layout-biz-root.jsp} | 2 +- ...les-dashboard.jsp => layout-dashboard.jsp} | 2 +- ...ayout-tiles-popup.jsp => layout-popup.jsp} | 25 +- .../fims/tiles/none/layout-tiles-none.jsp | 4 - .../resources/js/fims/biz/layout/myView.js | 2 - 68 files changed, 247 insertions(+), 855 deletions(-) delete mode 100644 src/main/resources/spring/context-resolver.xml delete mode 100644 src/main/resources/template/tiles/layout-tiles-defs.xml rename src/main/webapp/WEB-INF/jsp/template/fims/{tiles/biz/layout-tiles-biz-inner.jsp => layout-biz-inner.jsp} (94%) rename src/main/webapp/WEB-INF/jsp/template/fims/{tiles/biz/layout-tiles-biz-org.jsp => layout-biz-org.jsp} (96%) rename src/main/webapp/WEB-INF/jsp/template/fims/{tiles/biz/layout-tiles-biz-pop.jsp => layout-biz-pop.jsp} (88%) rename src/main/webapp/WEB-INF/jsp/template/fims/{tiles/biz/layout-tiles-biz-root.jsp => layout-biz-root.jsp} (96%) rename src/main/webapp/WEB-INF/jsp/template/fims/{tiles/biz/layout-tiles-dashboard.jsp => layout-dashboard.jsp} (93%) rename src/main/webapp/WEB-INF/jsp/template/fims/{tiles/popup/layout-tiles-popup.jsp => layout-popup.jsp} (61%) delete mode 100644 src/main/webapp/WEB-INF/jsp/template/fims/tiles/none/layout-tiles-none.jsp diff --git a/README.md b/README.md index bc4eeabe..eeac9461 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,6 @@ escapeXml를 true로 설정함으로써 가장 간단하게 XSS(링크)를 방 # 윈도우 팝업 호출시 blockUI 적용 ```js // 팝업호출하는 화면단 : ~Form.jsp -// tiles biz jsp단에서 var popup 선언되어 있음 $.blockUI({message: '' ,css: {width: '100%', height: '100%'} //모달창 외부 클릭시 닫기 ,onOverlayClick: () => { @@ -249,7 +248,6 @@ popup = CmmPopup.open(url, params, popOption, popTitle); // 팝업창 // event에 아래 코드 추가 -// tiles biz jsp단에서 var unblockUI = () => $.unblockUI() 선언되어 있음 $(window).on("unload", function (e) { window.opener?.unblockUI(); window.opener?.callbackSearch(); diff --git a/pom.xml b/pom.xml index b3b47814..af3faf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ ${java.version} ${java.version} - 3.0.5 + @@ -96,53 +96,7 @@ 1.2 - - org.apache.taglibs - taglibs-standard-impl - 1.2.5 - - - - org.apache.tiles - tiles-jsp - ${org.apache.tiles.version} - - - org.apache.tiles - tiles-extras - ${org.apache.tiles.version} - - - - org.springframework - spring-aop - 5.3.20 - - - org.springframework - spring-beans - 5.3.20 - - - org.springframework - spring-context - 5.3.20 - - - org.springframework - spring-core - 5.3.20 - - - org.springframework - spring-expression - 5.3.20 - - - org.springframework - spring-web - 5.3.20 - + org.egovframe.rte org.egovframe.rte.fdl.cmmn diff --git a/src/main/java/cokr/xit/fims/biz/ens/adm/web/SendRqstMngController.java b/src/main/java/cokr/xit/fims/biz/ens/adm/web/SendRqstMngController.java index 888e3602..fae6f4c8 100644 --- a/src/main/java/cokr/xit/fims/biz/ens/adm/web/SendRqstMngController.java +++ b/src/main/java/cokr/xit/fims/biz/ens/adm/web/SendRqstMngController.java @@ -67,7 +67,7 @@ public class SendRqstMngController extends AbstractController { return EnsConst.JSP_BASE_PATH +"adm/SendRqstMng" +"_"+new Object() {}.getClass().getEnclosingMethod().getName() //메소드명 - +".ens"; //tiles 타입 + ; } @@ -160,7 +160,7 @@ public class SendRqstMngController extends AbstractController { return EnsConst.JSP_BASE_PATH +"adm/SendRqstMng" +"_"+new Object() {}.getClass().getEnclosingMethod().getName() //메소드명 - +".ens-pop"; //tiles 타입 + ; } diff --git a/src/main/java/cokr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java b/src/main/java/cokr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java index 7e314f77..8abbc910 100644 --- a/src/main/java/cokr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java +++ b/src/main/java/cokr/xit/fims/biz/ens/adm/web/StatsBySignTalkByYearController.java @@ -64,7 +64,7 @@ public class StatsBySignTalkByYearController extends AbstractController { return EnsConst.JSP_BASE_PATH +"adm/StatsBySignTalkByYear" +"_"+new Object() {}.getClass().getEnclosingMethod().getName() //메소드명 - +".ens"; //tiles 타입 + ; } /** diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/FrameworkCmmController.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/FrameworkCmmController.java index 7541bef9..3ecee6d6 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/FrameworkCmmController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/FrameworkCmmController.java @@ -4,7 +4,7 @@ package cokr.xit.fims.framework.biz.cmm.web; import cokr.xit.foundation.web.AbstractController; import cokr.xit.fims.framework.biz.cmm.service.XitFramePopupService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import cokr.xit.fims.framework.core.XitBaseSearchVO; import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import org.springframework.context.support.ReloadableResourceBundleMessageSource; @@ -48,7 +48,7 @@ public class FrameworkCmmController extends AbstractController { */ @GetMapping(name = "", value="/popup/ZipSearch") public String ZipSearch() { - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/popup/XitZipSearch"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/popup/XitZipSearch"; } /** *
메소드 설명: 우편번호 검색
@@ -79,7 +79,7 @@ public class FrameworkCmmController extends AbstractController { paginationInfo.setTotalRecordCount(totCnt); modelMap.addAttribute("paginationInfo", paginationInfo); - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/popup/XitZipSearchList"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/popup/XitZipSearchList"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java index 31b8100d..ac9a04a0 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFrameAnonymousController.java @@ -7,7 +7,7 @@ import cokr.xit.fims.framework.biz.mng.user.XitUserRegMngSearchVO; import cokr.xit.fims.framework.biz.mng.user.XitUserRegMngVO; import cokr.xit.fims.framework.biz.mng.user.service.UserMgtService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import cokr.xit.fims.framework.core.constants.FrameworkConstants.USER_SE; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; @@ -79,7 +79,7 @@ public class XitFrameAnonymousController extends AbstractController { modelMap.addAttribute("checkId", checkId); } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/XitIdDuplCnfirm"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/XitIdDuplCnfirm"; } @@ -153,7 +153,7 @@ public class XitFrameAnonymousController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/XitUserReg_"+cmd+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/XitUserReg_"+cmd; } @RequestMapping(name = "", value = "login/UserReg_Forms_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String UserReg_Forms_page(@PathVariable String cmd @@ -177,7 +177,7 @@ public class XitFrameAnonymousController extends AbstractController { - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/forms/"+page+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/forms/"+page; } @@ -365,8 +365,8 @@ public class XitFrameAnonymousController extends AbstractController { * -.작업내용: popup api -> 검색 api 호출 방식으로 변경 ====================== */ //2021.06.22. 주석처리 -// return XitConst.JSP_BASE_PATH+"cmm/anonymous/api/XitAdresSearch"+XitConst.TILES_TYPE.POPUP.getVal(); - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/api/XitAdresSearchApi"+ TILES_TYPE.NONE.getVal(); + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/api/XitAdresSearchApi"; } @@ -377,12 +377,12 @@ public class XitFrameAnonymousController extends AbstractController { ========================== */ @GetMapping(name = "", value = "step1") public String step1(HttpServletRequest req) { - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/step1"+ TILES_TYPE.NONE.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/step1"; } @GetMapping(name = "", value = "step2") public String step2() { - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/step2"+ TILES_TYPE.NONE.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/anonymous/step2"; } @GetMapping(name = "", value = "login") public String login(HttpServletRequest req) { diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFrameFileController.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFrameFileController.java index 4caf386d..162ca1a1 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFrameFileController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFrameFileController.java @@ -2,7 +2,7 @@ package cokr.xit.fims.framework.biz.cmm.web; import cokr.xit.foundation.web.AbstractController; import cokr.xit.fims.framework.biz.cmm.service.XitFrameFileService; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import cokr.xit.fims.framework.core.BaseVO; import cokr.xit.fims.framework.core.XitBaseSearchVO; import org.springframework.context.support.ReloadableResourceBundleMessageSource; @@ -67,7 +67,7 @@ public class XitFrameFileController extends AbstractController { modelMap.addAttribute("updateFlag", "N"); modelMap.addAttribute("fileListCnt", result.size()); modelMap.addAttribute("atchFileId", atchFileId); - return "framework/biz/common/file/XitAttachFile_list"+TILES_TYPE.NONE.getVal(); + return "framework/biz/common/file/XitAttachFile_list"; } /** @@ -89,7 +89,7 @@ public class XitFrameFileController extends AbstractController { modelMap.addAttribute("updateFlag", "N"); modelMap.addAttribute("fileListCnt", result.size()); modelMap.addAttribute("atchFileId", atchFileId); - return "framework/biz/common/file/XitAttachFile_imgage_list"+TILES_TYPE.NONE.getVal(); + return "framework/biz/common/file/XitAttachFile_imgage_list"; } @@ -97,7 +97,6 @@ public class XitFrameFileController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param page - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -105,20 +104,18 @@ public class XitFrameFileController extends AbstractController { */ @RequestMapping(name = "", value = "AttachFile_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String AttachFile_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("vo") BaseVO vo , @ModelAttribute("searchVO") XitBaseSearchVO searchVO , ModelMap model ,@RequestParam(value="atchFileId", required=false, defaultValue="") String atchFileId ) { - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - String returnUrl = "kr/xit/framework/biz/cmm/file/XitAttachFile_" +cmd+tilesDef; + + String returnUrl = "kr/xit/framework/biz/cmm/file/XitAttachFile_" +cmd; List> result = null; switch (cmd) { -// case "input": //등록 페이지 -// break; + case "edit": //수정 페이지 result = xitFrameFileService.findList(atchFileId); @@ -128,11 +125,10 @@ public class XitFrameFileController extends AbstractController { model.addAttribute("fileListCnt", result.size()); model.addAttribute("atchFileId", atchFileId); - returnUrl = "kr/xit/framework/biz/cmm/file/XitAttachFile_list" +TILES_TYPE.NONE.getVal(); + returnUrl = "kr/xit/framework/biz/cmm/file/XitAttachFile_list" ; break; -// case "view": //상세 페이지 -// break; + default: throw new RuntimeException("유효하지 않은 요청 입니다."); @@ -164,7 +160,7 @@ public class XitFrameFileController extends AbstractController { } - return "framework/biz/common/file/XitAttachFile_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return "framework/biz/common/file/XitAttachFile_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFramePopupController.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFramePopupController.java index 0d4019d9..6843234d 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFramePopupController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitFramePopupController.java @@ -3,7 +3,7 @@ package cokr.xit.fims.framework.biz.cmm.web; import cokr.xit.foundation.web.AbstractController; import cokr.xit.fims.framework.biz.cmm.service.XitFramePopupService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import cokr.xit.fims.framework.core.XitBaseSearchVO; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.egovframe.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; @@ -49,7 +49,7 @@ public class XitFramePopupController extends AbstractController { */ @RequestMapping(name = "", value="ZipSearch", method={RequestMethod.GET, RequestMethod.POST}) public String ZipSearch(ModelMap modelMap) { - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/popup/XitZipSearch"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/popup/XitZipSearch"; } /** *
메소드 설명: 우편번호 검색
@@ -80,7 +80,7 @@ public class XitFramePopupController extends AbstractController { paginationInfo.setTotalRecordCount(totCnt); modelMap.addAttribute("paginationInfo", paginationInfo); - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/popup/XitZipSearchList"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"cmm/popup/XitZipSearchList"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitLoginController.java b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitLoginController.java index 0c97829c..bfb9f73b 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitLoginController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/cmm/web/XitLoginController.java @@ -6,7 +6,7 @@ import cokr.xit.fims.framework.biz.cmm.service.XitFrameCrudService; import cokr.xit.fims.framework.biz.cmm.service.XitLoginService; import cokr.xit.fims.framework.biz.mng.user.XitUserInfoVO; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import cokr.xit.fims.framework.core.constants.FrameworkConstants.USER_SE; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; @@ -75,7 +75,7 @@ public class XitLoginController extends AbstractController { // 1. Spring Security 사용자권한 처리 Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); if (!isAuthenticated) { - //return LOGIN_PAGE+TILES_TYPE.NONE.getVal(); + return LOGIN_PAGE; } @@ -215,13 +215,7 @@ public class XitLoginController extends AbstractController { */ @RequestMapping(name = "", value="accessDenied") public void accessDenied(HttpServletRequest request, HttpServletResponse response) throws Exception { - /* ====================================================== - * 2020.11.24. 박민규 - * 응답방식 수정 - * -사유: 미인증 사용자의 경우 로그인페이지로 이동 - ====================================================== */ - //2020.11.24. 주석처리 -// return XitConst.JSP_BASE_PATH+XitProperties.getProperty("Globals.Xit.AccessDeniedPage")+TILES_TYPE.NONE.getVal(); + /** * 호출 유형에 따른 분기 */ @@ -241,7 +235,7 @@ public class XitLoginController extends AbstractController { //인증사용자 if(isAuthenticated) { //응답 - response.sendRedirect(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +ACCESS_DENIED_PAGE+TILES_TYPE.NONE.getVal()); + response.sendRedirect(FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +ACCESS_DENIED_PAGE); //미인증사용자 }else { diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerCmdMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerCmdMngController.java index 7a24921b..b0a739c0 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerCmdMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerCmdMngController.java @@ -4,7 +4,7 @@ import cokr.xit.foundation.web.AbstractController; import cokr.xit.fims.framework.biz.mng.admin.XitAdminServerCmdMngSearchVO; import cokr.xit.fims.framework.biz.mng.admin.XitAdminServerCmdMngVO; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCommandExecutor; import org.springframework.stereotype.Controller; @@ -80,8 +80,7 @@ public class XitAdminServerCmdMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
- * @param page - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) + * @param cmd * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -91,7 +90,6 @@ public class XitAdminServerCmdMngController extends AbstractController { */ @RequestMapping(name = "", value = "AdminServerCmdMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String AdminServerCmdMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef , @ModelAttribute("vo") XitAdminServerCmdMngVO vo , @ModelAttribute("searchVO") XitAdminServerCmdMngSearchVO searchVO , ModelMap model @@ -112,16 +110,14 @@ public class XitAdminServerCmdMngController extends AbstractController { throw new RuntimeException("유효하지 않은 요청 입니다."); } - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerCmdMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerCmdMng_"+cmd; } /** *
메소드 설명: 요청 팝업 페이지 이동 한다.
- * @param page + * @param cmd * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -139,7 +135,7 @@ public class XitAdminServerCmdMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerCmdMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerCmdMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerFileMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerFileMngController.java index dcf04dad..cd766864 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerFileMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerFileMngController.java @@ -4,7 +4,7 @@ import cokr.xit.foundation.web.AbstractController; import cokr.xit.fims.framework.biz.mng.admin.XitAdminServerFileMngSearchVO; import cokr.xit.fims.framework.biz.mng.admin.XitAdminServerFileMngVO; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; import cokr.xit.fims.framework.core.utils.XitHttpRequestHelper; @@ -61,7 +61,6 @@ public class XitAdminServerFileMngController extends AbstractController { */ @RequestMapping(name = "", value = "AdminServerFileMng_list", method={RequestMethod.GET, RequestMethod.POST}) public String AdminServerFileMng_list(@ModelAttribute("searchVO") XitAdminServerFileMngSearchVO searchVO, ModelMap model - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef ) { /** @@ -93,9 +92,8 @@ public class XitAdminServerFileMngController extends AbstractController { } - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerFileMng_list"+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerFileMng_list"; } @@ -171,8 +169,7 @@ public class XitAdminServerFileMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
- * @param page - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) + * @param cmd * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -182,7 +179,7 @@ public class XitAdminServerFileMngController extends AbstractController { */ @RequestMapping(name = "", value = "AdminServerFileMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public void AdminServerFileMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("vo") XitAdminServerFileMngVO vo , @ModelAttribute("searchVO") XitAdminServerFileMngSearchVO searchVO , ModelMap model @@ -280,7 +277,7 @@ public class XitAdminServerFileMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerFileMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerFileMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerLogMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerLogMngController.java index 65c861c5..3e610e71 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerLogMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitAdminServerLogMngController.java @@ -4,7 +4,7 @@ import cokr.xit.foundation.web.AbstractController; import cokr.xit.fims.framework.biz.mng.admin.XitAdminServerLogMngSearchVO; import cokr.xit.fims.framework.biz.mng.admin.XitAdminServerLogMngVO; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; import cokr.xit.fims.framework.core.utils.XitHttpRequestHelper; @@ -62,7 +62,6 @@ public class XitAdminServerLogMngController extends AbstractController { */ @RequestMapping(name = "", value = "AdminServerLogMng_list", method={RequestMethod.GET, RequestMethod.POST}) public String AdminServerLogMng_list(@ModelAttribute("searchVO") XitAdminServerLogMngSearchVO searchVO, ModelMap model - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef ) { @@ -101,10 +100,8 @@ public class XitAdminServerLogMngController extends AbstractController { } - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerLogMng_list"+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerLogMng_list"; } @@ -235,7 +232,6 @@ public class XitAdminServerLogMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param page - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -245,7 +241,7 @@ public class XitAdminServerLogMngController extends AbstractController { */ @RequestMapping(name = "", value = "AdminServerLogMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public void AdminServerLogMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("vo") XitAdminServerLogMngVO vo , @ModelAttribute("searchVO") XitAdminServerLogMngSearchVO searchVO , ModelMap model @@ -294,7 +290,7 @@ public class XitAdminServerLogMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerLogMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitAdminServerLogMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitConectionLogMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitConectionLogMngController.java index 9eae1b55..9d875a72 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitConectionLogMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitConectionLogMngController.java @@ -120,7 +120,6 @@ public class XitConectionLogMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param cmd String - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -128,7 +127,7 @@ public class XitConectionLogMngController extends AbstractController { */ @RequestMapping(name = "", value = "ConectionLogMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String ConectionLogMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("cmmnCode") XitConectionLogMngVO vo , @ModelAttribute XitConectionLogMngSearchVO searchVO , ModelMap model) { @@ -144,9 +143,8 @@ public class XitConectionLogMngController extends AbstractController { } - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitConectionLogMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitConectionLogMng_"+cmd; } @@ -171,7 +169,7 @@ public class XitConectionLogMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitConectionLogMng_"+cmd+"_popup"+ FrameworkConstants.TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitConectionLogMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitConectionStatsMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitConectionStatsMngController.java index 54470156..61e76f17 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitConectionStatsMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/admin/web/XitConectionStatsMngController.java @@ -144,7 +144,6 @@ public class XitConectionStatsMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param cmd String - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -152,7 +151,7 @@ public class XitConectionStatsMngController extends AbstractController { */ @RequestMapping(name = "", value = "ConectionStatsMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String ConectionStatsMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute() XitConectionStatsMngVO vo , @ModelAttribute XitConectionStatsMngSearchVO searchVO , ModelMap model) { @@ -169,9 +168,8 @@ public class XitConectionStatsMngController extends AbstractController { } - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitConectionStatsMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitConectionStatsMng_"+cmd; } @@ -196,7 +194,7 @@ public class XitConectionStatsMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitConectionStatsMng_"+cmd+"_popup"+ FrameworkConstants.TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/admin/XitConectionStatsMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/web/XitLoginPolicyMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/web/XitLoginPolicyMngController.java index fdf77bda..c5c008f0 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/auth/web/XitLoginPolicyMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/auth/web/XitLoginPolicyMngController.java @@ -118,7 +118,6 @@ public class XitLoginPolicyMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param cmd String - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -126,14 +125,13 @@ public class XitLoginPolicyMngController extends AbstractController { */ @RequestMapping(name = "", value = "loginPolicyMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String loginPolicyMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("vo") XitLoginPolicyMngVO vo , @ModelAttribute("searchVO") XitLoginPolicyMngSearchVO searchVO , ModelMap model ) { - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - String returnUrl = FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/loginPolicyMng_"+cmd+tilesDef; + + String returnUrl = FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/loginPolicyMng_"+cmd; switch (cmd) { case "input": //등록 페이지 @@ -146,7 +144,7 @@ public class XitLoginPolicyMngController extends AbstractController { model.addAttribute("loginPolicy", result); model.addAttribute("message", "정상적으로 조회 되었습니다."); if("N".equals(result.getRegYn())) - returnUrl = FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/loginPolicyMng_input"+tilesDef; + returnUrl = FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/loginPolicyMng_input"; break; default: throw new RuntimeException("유효하지 않은 요청 입니다."); @@ -179,7 +177,7 @@ public class XitLoginPolicyMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/loginPolicyMng_"+cmd+"_popup"+ FrameworkConstants.TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/auth/loginPolicyMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBasicBbsMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBasicBbsMngController.java index 6645e30b..567026f1 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBasicBbsMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBasicBbsMngController.java @@ -11,7 +11,7 @@ import cokr.xit.fims.framework.biz.mng.bbs.XitBbsCreateMngVO; import cokr.xit.fims.framework.biz.mng.bbs.service.XitBasicBbsMngService; import cokr.xit.fims.framework.biz.mng.bbs.service.XitBbsCreateMngService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import cokr.xit.fims.framework.core.XitAttachFileRespVO; import org.springframework.context.support.ReloadableResourceBundleMessageSource; @@ -88,7 +88,7 @@ public class XitBasicBbsMngController extends AbstractController { @RequestMapping(name = "", value = "BasicBbsMng_{bbsId}_list", method={RequestMethod.GET, RequestMethod.POST}) public String BasicBbsMng_list(@ModelAttribute("searchVO") XitBasicBbsMngSearchVO searchVO, ModelMap model ,@PathVariable String bbsId - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + ) { XitLoginVO loginVO = (XitLoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); @@ -139,9 +139,8 @@ public class XitBasicBbsMngController extends AbstractController { model.addAttribute("paginationInfo", paginationInfo); - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBasicBbsMng_list"+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBasicBbsMng_list"; } @@ -210,7 +209,6 @@ public class XitBasicBbsMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param cmd String - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -218,7 +216,7 @@ public class XitBasicBbsMngController extends AbstractController { */ @RequestMapping(name = "", value = "BasicBbsMng_{bbsId}_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String BasicBbsMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("vo") XitBasicBbsMngVO vo , @ModelAttribute("searchVO") XitBasicBbsMngSearchVO searchVO , ModelMap model @@ -386,9 +384,8 @@ public class XitBasicBbsMngController extends AbstractController { } - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBasicBbsMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBasicBbsMng_"+cmd; } @@ -413,7 +410,7 @@ public class XitBasicBbsMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBasicBbsMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBasicBbsMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsCreateMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsCreateMngController.java index 313bcb88..9bf3faa8 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsCreateMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsCreateMngController.java @@ -7,7 +7,7 @@ import cokr.xit.fims.framework.biz.mng.bbs.XitBbsCreateMngSearchVO; import cokr.xit.fims.framework.biz.mng.bbs.XitBbsCreateMngVO; import cokr.xit.fims.framework.biz.mng.bbs.service.XitBbsCreateMngService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; import cokr.xit.fims.framework.core.validation.XitBeanValidator; @@ -157,7 +157,6 @@ public class XitBbsCreateMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param cmd - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -165,7 +164,7 @@ public class XitBbsCreateMngController extends AbstractController { */ @RequestMapping(name = "", value = "BbsCreateMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String BbsCreateMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("vo") XitBbsCreateMngVO vo , @ModelAttribute("searchVO") XitBbsCreateMngSearchVO searchVO , ModelMap model) { @@ -184,9 +183,8 @@ public class XitBbsCreateMngController extends AbstractController { } - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsCreateMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsCreateMng_"+cmd; } @@ -236,7 +234,7 @@ public class XitBbsCreateMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsCreateMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsCreateMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsTmplateMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsTmplateMngController.java index 3ba1def3..f4489849 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsTmplateMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsTmplateMngController.java @@ -7,7 +7,7 @@ import cokr.xit.fims.framework.biz.mng.bbs.XitBbsTmplateMngSearchVO; import cokr.xit.fims.framework.biz.mng.bbs.XitBbsTmplateMngVO; import cokr.xit.fims.framework.biz.mng.bbs.service.XitBbsTmplateMngService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; import cokr.xit.fims.framework.core.validation.XitBeanValidator; @@ -124,8 +124,7 @@ public class XitBbsTmplateMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
- * @param page - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) + * @param cmd * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -133,7 +132,6 @@ public class XitBbsTmplateMngController extends AbstractController { */ @RequestMapping(name = "", value = "BbsTmplateMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String BbsTmplateMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef , @ModelAttribute("vo") XitBbsTmplateMngVO vo , @ModelAttribute("searchVO") XitBbsTmplateMngSearchVO searchVO , ModelMap model) { @@ -150,17 +148,15 @@ public class XitBbsTmplateMngController extends AbstractController { throw new RuntimeException("유효하지 않은 요청 입니다."); } - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsTmplateMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsTmplateMng_"+cmd; } /** *
메소드 설명: 요청 팝업 페이지 이동 한다.
- * @param page + * @param cmd * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -181,7 +177,7 @@ public class XitBbsTmplateMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsTmplateMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsTmplateMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsUseMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsUseMngController.java index b3df7370..9527e22b 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsUseMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/bbs/web/XitBbsUseMngController.java @@ -7,7 +7,7 @@ import cokr.xit.fims.framework.biz.mng.bbs.XitBbsUseMngSearchVO; import cokr.xit.fims.framework.biz.mng.bbs.XitBbsUseMngVO; import cokr.xit.fims.framework.biz.mng.bbs.service.XitBbsUseMngService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; import cokr.xit.fims.framework.core.validation.XitBeanValidator; @@ -125,7 +125,6 @@ public class XitBbsUseMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param cmd - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -133,7 +132,7 @@ public class XitBbsUseMngController extends AbstractController { */ @RequestMapping(name = "", value = "BbsUseMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String BbsUseMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("vo") XitBbsUseMngVO vo , @ModelAttribute("searchVO") XitBbsUseMngSearchVO searchVO , ModelMap model) { @@ -160,10 +159,8 @@ public class XitBbsUseMngController extends AbstractController { throw new RuntimeException("유효하지 않은 요청 입니다."); } - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsUseMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsUseMng_"+cmd; } @@ -188,7 +185,7 @@ public class XitBbsUseMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsUseMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/bbs/XitBbsUseMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/UserMgtController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/UserMgtController.java index bbfce5fa..baa74dc2 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/UserMgtController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/UserMgtController.java @@ -6,7 +6,7 @@ import cokr.xit.fims.framework.biz.mng.user.XitUserRegMngSearchVO; import cokr.xit.fims.framework.biz.mng.user.XitUserRegMngVO; import cokr.xit.fims.framework.biz.mng.user.service.UserMgtService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import cokr.xit.fims.framework.core.utils.XitCmmnUtil; import cokr.xit.fims.framework.support.mybatis.MybatisUtils; @@ -159,7 +159,7 @@ public class UserMgtController extends AbstractController { default: throw new RuntimeException("유효하지 않은 요청 입니다."); } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserRegMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserRegMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserAbsntMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserAbsntMngController.java index 83b381d8..cb4d9eb2 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserAbsntMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserAbsntMngController.java @@ -7,7 +7,7 @@ import cokr.xit.fims.framework.biz.mng.user.XitUserAbsntMngSearchVO; import cokr.xit.fims.framework.biz.mng.user.XitUserAbsntMngVO; import cokr.xit.fims.framework.biz.mng.user.service.XitUserAbsntMngService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; import cokr.xit.fims.framework.core.validation.XitBeanValidator; @@ -131,7 +131,6 @@ public class XitUserAbsntMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param cmd - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -139,7 +138,7 @@ public class XitUserAbsntMngController extends AbstractController { */ @RequestMapping(name = "", value = "userAbsntMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String userAbsntMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("userAbsnceSearchVO") XitUserAbsntMngSearchVO searchVO , @ModelAttribute("userAbsnceVO") XitUserAbsntMngVO vo , @RequestParam("userId") String userId @@ -163,10 +162,8 @@ public class XitUserAbsntMngController extends AbstractController { throw new RuntimeException("유효하지 않은 요청 입니다."); } - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserAbsntMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserAbsntMng_"+cmd; } @@ -194,7 +191,7 @@ public class XitUserAbsntMngController extends AbstractController { } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserAbsntMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserAbsntMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java b/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java index 60e7ca16..ef3a6299 100644 --- a/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java +++ b/src/main/java/cokr/xit/fims/framework/biz/mng/user/web/XitUserEtcOptMngController.java @@ -6,7 +6,7 @@ import cokr.xit.fims.framework.biz.mng.user.XitUserEtcOptMngSearchVO; import cokr.xit.fims.framework.biz.mng.user.XitUserEtcOptMngVO; import cokr.xit.fims.framework.biz.mng.user.service.XitUserEtcOptMngService; import cokr.xit.fims.framework.core.constants.FrameworkConstants; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import org.springframework.context.support.ReloadableResourceBundleMessageSource; import cokr.xit.fims.framework.core.utils.XitCmmnUtil; import cokr.xit.fims.framework.support.util.AjaxUtils; @@ -127,7 +127,6 @@ public class XitUserEtcOptMngController extends AbstractController { /** *
메소드 설명: 요청 페이지로 이동 한다.
* @param page - * @param tilesDef 타일즈 적용 Type(none: tiles 미적용) * @param model * @return String 요청처리 후 응답객체 * @author: 박민규 @@ -135,7 +134,7 @@ public class XitUserEtcOptMngController extends AbstractController { */ @RequestMapping(name = "", value = "userEtcOptMng_{cmd}", method={RequestMethod.GET, RequestMethod.POST}) public String userEtcOptMng_page(@PathVariable String cmd - , @RequestParam(value="tilesDef", required=false, defaultValue="") String tilesDef + , @ModelAttribute("userSearchVO") XitUserEtcOptMngSearchVO searchVO , @ModelAttribute("userEtcOptionManageVO") XitUserEtcOptMngVO vo , ModelMap model @@ -147,10 +146,8 @@ public class XitUserEtcOptMngController extends AbstractController { throw new RuntimeException("유효하지 않은 요청 입니다."); } - - if(!"".equals(tilesDef)) - tilesDef = "."+tilesDef; - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserEtcOptMng_"+cmd+tilesDef; + + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserEtcOptMng_"+cmd; } @@ -177,7 +174,7 @@ public class XitUserEtcOptMngController extends AbstractController { default: throw new RuntimeException("유효하지 않은 요청 입니다."); } - return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserEtcOptMng_"+cmd+"_popup"+TILES_TYPE.POPUP.getVal(); + return FrameworkConstants.FRAMEWORK_JSP_BASE_PATH +"mng/usr/XitUserEtcOptMng_"+cmd+"_popup"; } diff --git a/src/main/java/cokr/xit/fims/framework/core/constants/FrameworkConstants.java b/src/main/java/cokr/xit/fims/framework/core/constants/FrameworkConstants.java index 34081048..ab58f3fe 100644 --- a/src/main/java/cokr/xit/fims/framework/core/constants/FrameworkConstants.java +++ b/src/main/java/cokr/xit/fims/framework/core/constants/FrameworkConstants.java @@ -21,32 +21,7 @@ public class FrameworkConstants { public static final String JSON_VIEW = "jsonView"; - /** - * - * @업무그룹명: 타일즈 레이아웃 타입 - * @설명: - * @최초작성일: 2020. 4. 29. 오후 4:33:01 - * @최초작성자: 박민규 - * @author (주)엑스아이티 개발팀 - * @since 2002. 2. 2. - * @version 1.0 Copyright(c) XIT All rights reserved. - */ - public enum TILES_TYPE{ - NONE(".none") //타일즈 미적용 - ,BASE(".base") //기본 tiles layout - ,POPUP(".popup") //팝업페이지 tiles layout - ,FIMS_POPUP(".fims-pop") //팝업페이지 tiles layout - ,MAIN(".main") //메인화면 tiles layout - ; - - private String val; - private TILES_TYPE(String val) { - this.val = val; - } - public String getVal() { - return this.val; - } - } + /** diff --git a/src/main/java/cokr/xit/fims/framework/core/interceptor/MenuIntercepter.java b/src/main/java/cokr/xit/fims/framework/core/interceptor/MenuIntercepter.java index bda82908..95979be0 100644 --- a/src/main/java/cokr/xit/fims/framework/core/interceptor/MenuIntercepter.java +++ b/src/main/java/cokr/xit/fims/framework/core/interceptor/MenuIntercepter.java @@ -3,7 +3,7 @@ package cokr.xit.fims.framework.core.interceptor; import com.fasterxml.jackson.databind.JsonMappingException; import cokr.xit.fims.framework.biz.cache.util.CacheServiceUtils; import cokr.xit.fims.framework.biz.cmm.XitLoginVO; -import cokr.xit.fims.framework.core.constants.FrameworkConstants.TILES_TYPE; + import cokr.xit.fims.framework.support.exception.JSONExceptionMessageWriter; import cokr.xit.fims.framework.support.util.Checks; import cokr.xit.fims.framework.support.util.constants.Globals; @@ -50,9 +50,7 @@ public class MenuIntercepter extends HandlerInterceptorAdapter { if(mv == null) return; - //타일즈 적용 여부 - String viewName = mv.getViewName(); - boolean isTiles = (viewName.endsWith(TILES_TYPE.NONE.getVal())||viewName.endsWith(TILES_TYPE.POPUP.getVal())||viewName.endsWith(TILES_TYPE.FIMS_POPUP.getVal()))? false: true; + //사용자의 인증 여부 확인 boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); @@ -60,46 +58,46 @@ public class MenuIntercepter extends HandlerInterceptorAdapter { /** * 사용자별 메뉴 목록 조회 */ - if(isTiles) { - List> allMenuList = null; - - //메뉴목록 조회 - if(isAuthenticated) { - //사용자정보 취득 - XitLoginVO loginVO = (XitLoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - - //사용자별 메뉴 목록 조회 - allMenuList = CacheServiceUtils.findMenuListByUser(loginVO.getUniqId()); - - } - else { - //익명사용자 메뉴 목록 조회 - allMenuList = CacheServiceUtils.findMenuListByAuthorCode("ROLE_ANONYMOUS"); - } - // main page만 메뉴목록 / 공지사항 조회 - if(reqPath.contains("/framework/biz/cmm/mainPage")) { - mv.addObject("allMenuList", allMenuList); + List> allMenuList = null; + //메뉴목록 조회 + if(isAuthenticated) { + //사용자정보 취득 + XitLoginVO loginVO = (XitLoginVO) EgovUserDetailsHelper.getAuthenticatedUser(); - } + //사용자별 메뉴 목록 조회 + allMenuList = CacheServiceUtils.findMenuListByUser(loginVO.getUniqId()); + + } + else { + //익명사용자 메뉴 목록 조회 + allMenuList = CacheServiceUtils.findMenuListByAuthorCode("ROLE_ANONYMOUS"); + } + + // main page만 메뉴목록 / 공지사항 조회 + if(reqPath.contains("/framework/biz/cmm/mainPage")) { + mv.addObject("allMenuList", allMenuList); - //요청페이지 정보 Setting - for(int i=0; i < allMenuList.size(); i++) { - Map mUrlInfo = allMenuList.get(i); - - if (Checks.isNotEmpty(mUrlInfo.get("menuView")) && mUrlInfo.get("menuView").toString().contains(reqPath)) { - String[] arrPath = mUrlInfo.get("menuPath").toString().split("_"); - if(arrPath.length > 1){ - mUrlInfo.put("secondMenu", arrPath[1]); - } - mv.addObject("urlInfoMap", mUrlInfo); - break; + + } + + //요청페이지 정보 Setting + for(int i=0; i < allMenuList.size(); i++) { + Map mUrlInfo = allMenuList.get(i); + + if (Checks.isNotEmpty(mUrlInfo.get("menuView")) && mUrlInfo.get("menuView").toString().contains(reqPath)) { + String[] arrPath = mUrlInfo.get("menuPath").toString().split("_"); + if(arrPath.length > 1){ + mUrlInfo.put("secondMenu", arrPath[1]); } + mv.addObject("urlInfoMap", mUrlInfo); + break; } } } + public Map getChkUrlAddLength() { return chkUrlAddLength; } diff --git a/src/main/resources/spring/context-resolver.xml b/src/main/resources/spring/context-resolver.xml deleted file mode 100644 index 9b0f306b..00000000 --- a/src/main/resources/spring/context-resolver.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - classpath:/template/tiles/layout-tiles-defs.xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/spring/dispatcher-servlet.xml b/src/main/resources/spring/dispatcher-servlet.xml index afa764bf..d0c4064a 100644 --- a/src/main/resources/spring/dispatcher-servlet.xml +++ b/src/main/resources/spring/dispatcher-servlet.xml @@ -16,37 +16,35 @@ - + p:viewClass="org.springframework.web.servlet.view.JstlView" + p:prefix="/WEB-INF/jsp/" p:suffix=".jsp" + p:exposeContextBeansAsAttributes="true"/> + + + + + - - - - + + + + \ No newline at end of file diff --git a/src/main/resources/template/tiles/layout-tiles-defs.xml b/src/main/resources/template/tiles/layout-tiles-defs.xml deleted file mode 100644 index e8711f3f..00000000 --- a/src/main/resources/template/tiles/layout-tiles-defs.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitConectionLogMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitConectionLogMng_list.jsp index ddb9efec..7dc17971 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitConectionLogMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitConectionLogMng_list.jsp @@ -138,9 +138,9 @@ var XitConectionLogMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitConectionStatsMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitConectionStatsMng_list.jsp index 829d2514..b0ef63b1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitConectionStatsMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/XitConectionStatsMng_list.jsp @@ -178,9 +178,9 @@ var XitConectionStatsMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; @@ -202,8 +202,8 @@ var XitConectionStatsMng_list = { fnClickStatsBtn: function(props){ var rowData = props.grid.getRow(props.rowKey); var params = ""; - params += "logId=" + rowData.logId + "&"; - params += "tilesDef=popup"; + params += "logId=" + rowData.logId; + XitConectionStatsMng_list.pagePopup('detail', "", params); } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/backup/XitConectionLogMng_list2.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/backup/XitConectionLogMng_list2.jsp index 5d449b10..4f7f7545 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/backup/XitConectionLogMng_list2.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/admin/backup/XitConectionLogMng_list2.jsp @@ -62,7 +62,7 @@ //팝업 옵션 var openParam = "width="+w+"px, height="+h+"px, resizable=no, scrollbars=yes, location=no, left="+left+"px, top="+top+"px"; - window.open($$Control.urls.getInfo + "?logId="+logId+"&tilesDef=popup","p_loginLogInqire", openParam); + window.open($$Control.urls.getInfo + "?logId="+logId,"p_loginLogInqire", openParam); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list.jsp index 169bda78..d69940a5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthGrpMng_list.jsp @@ -177,9 +177,9 @@ var XitAuthGrpMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthHierarchyMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthHierarchyMng_list.jsp index 02390682..3621e1dd 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthHierarchyMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthHierarchyMng_list.jsp @@ -146,9 +146,9 @@ var XitAuthHierarchyMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list.jsp index 1e00df73..2dabb564 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRegMng_list.jsp @@ -184,9 +184,9 @@ var XitAuthRegMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRuleMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRuleMng_list.jsp index a0757751..c30566b2 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRuleMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthRuleMng_list.jsp @@ -169,9 +169,9 @@ var XitAuthRuleMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list.jsp index 222c5ded..b5be08c5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/backup/XitAuthUsrMng_list.jsp @@ -189,9 +189,9 @@ var XitAuthUsrMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_edit.jsp index 7c2fa4ef..aa324bff 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_edit.jsp @@ -71,15 +71,11 @@ 저장 삭제 - - - + 닫기 - - + 목록 - - + @@ -151,13 +147,8 @@ return } - /** - * 페이지 Open 방식에 따라 처리 분기(일반페이지 or 팝업페이지) - * -사유: 기존 구현된 일반페이지 -> 팝업페이지로 변경함에 따라 사용자 니즈에 맞춰 사용할 수 있도록 페이지 Open 방식에 따라 처리 분기 - * -처리방안: 팝업 페이지 열람 시 ajax 처리 - * submit 열람 시 submit 처리 - */ - if('${param.tilesDef}'=='popup'){ + + /* ajax 처리 Pattern */ if (confirm('수정하시겠습니까?')) { var param = $(document.loginPolicy).serialize(); @@ -177,26 +168,14 @@ }); } - }else{ - /* submit 처리 Pattern */ - if (confirm('수정하시겠습니까?')) { - document.loginPolicy.action = ""; - document.loginPolicy.submit(); - } - } + }, /* ======================== * 데이터 삭제 ======================== */ removeData : function(){ - /** - * 페이지 Open 방식에 따라 처리 분기(일반페이지 or 팝업페이지) - * -사유: 기존 구현된 일반페이지 -> 팝업페이지로 변경함에 따라 사용자 니즈에 맞춰 사용할 수 있도록 페이지 Open 방식에 따라 처리 분기 - * -처리방안: 팝업 페이지 열람 시 ajax 처리 - * submit 열람 시 submit 처리 - */ - if('${param.tilesDef}'=='popup'){ + /* ajax 처리 Pattern */ if (confirm('삭제하시겠습니까?')) { var param = $(document.loginPolicy).serialize(); @@ -216,13 +195,7 @@ }); } - }else{ - /* submit 처리 Pattern */ - if (confirm('삭제하시겠습니까?')) { - document.loginPolicy.action = ""; - document.loginPolicy.submit(); - } - } + }, /* ======================== * 유효성 검증 @@ -299,10 +272,10 @@ if(!(params == undefined || params == null)){ popUrl += "?"; popUrl += params; - popUrl += '&tilesDef=popup'; + }else{ popUrl += "?"; - popUrl += '&tilesDef=popup'; + } var popTitle = ''; switch (flag) { diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_input.jsp index 9396aabb..61c0d5ae 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_input.jsp @@ -63,15 +63,11 @@
저장 - - - + 닫기 - - + 목록 - - +
@@ -134,13 +130,7 @@ return } - /** - * 페이지 Open 방식에 따라 처리 분기(일반페이지 or 팝업페이지) - * -사유: 기존 구현된 일반페이지 -> 팝업페이지로 변경함에 따라 사용자 니즈에 맞춰 사용할 수 있도록 페이지 Open 방식에 따라 처리 분기 - * -처리방안: 팝업 페이지 열람 시 ajax 처리 - * submit 열람 시 submit 처리 - */ - if('${param.tilesDef}'=='popup'){ + /* ajax 처리 Pattern */ if (confirm('수정하시겠습니까?')) { var param = $(document.loginPolicy).serialize(); @@ -160,13 +150,7 @@ }); } - }else{ - /* submit 처리 Pattern */ - if (confirm('수정하시겠습니까?')) { - document.loginPolicy.action = ""; - document.loginPolicy.submit(); - } - } + }, /* ======================== @@ -253,10 +237,10 @@ if(!(params == undefined || params == null)){ popUrl += "?"; popUrl += params; - popUrl += '&tilesDef=popup'; + }else{ popUrl += "?"; - popUrl += '&tilesDef=popup'; + } var popTitle = ''; switch (flag) { diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_list.jsp index 810d4301..fd3986b5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/auth/loginPolicyMng_list.jsp @@ -134,9 +134,9 @@ var XitLoginPolicyMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp index 5c65c245..b2429021 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_edit.jsp @@ -187,15 +187,11 @@ 저장 - - - + 닫기 - - + 목록 - - + @@ -289,13 +285,7 @@ var XitBasicBbsMng_edit = { return; } - /** - * 페이지 Open 방식에 따라 처리 분기(일반페이지 or 팝업페이지) - * -사유: 기존 구현된 일반페이지 -> 팝업페이지로 변경함에 따라 사용자 니즈에 맞춰 사용할 수 있도록 페이지 Open 방식에 따라 처리 분기 - * -처리방안: 팝업 페이지 열람 시 ajax 처리 - * submit 열람 시 submit 처리 - */ - if('${param.tilesDef}'=='popup'){ + /* ajax 처리 Pattern */ if (confirm('수정하시겠습니까?')) { var param = new FormData($('#board')[0]); @@ -315,13 +305,7 @@ var XitBasicBbsMng_edit = { }); } - }else{ - /* submit 처리 Pattern */ - if (confirm('수정하시겠습니까?')) { - document.board.action = ""; - document.board.submit(); - } - } + }, /* ======================== diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp index 5812214c..a5d903ab 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_input.jsp @@ -139,15 +139,11 @@ 저장 - - - + 닫기 - - + 목록 - - + @@ -235,13 +231,7 @@ } - /** - * 페이지 Open 방식에 따라 처리 분기(일반페이지 or 팝업페이지) - * -사유: 기존 구현된 일반페이지 -> 팝업페이지로 변경함에 따라 사용자 니즈에 맞춰 사용할 수 있도록 페이지 Open 방식에 따라 처리 분기 - * -처리방안: 팝업 페이지 열람 시 ajax 처리 - * submit 열람 시 submit 처리 - */ - if('${param.tilesDef}'=='popup'){ + /* ajax 처리 Pattern */ if (confirm('등록하시겠습니까?')) { var param = new FormData($('#board')[0]); @@ -260,13 +250,7 @@ } }); } - }else{ - /* submit 처리 Pattern */ - if (confirm('등록하시겠습니까?')) { - document.board.action = ""; - document.board.submit(); - } - } + }, /* ======================== diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp index 7efed8a5..5e06ecb5 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_inputReply.jsp @@ -140,15 +140,11 @@ 저장 - - - + 닫기 - - + 목록 - - + @@ -230,13 +226,7 @@ return; } - /** - * 페이지 Open 방식에 따라 처리 분기(일반페이지 or 팝업페이지) - * -사유: 기존 구현된 일반페이지 -> 팝업페이지로 변경함에 따라 사용자 니즈에 맞춰 사용할 수 있도록 페이지 Open 방식에 따라 처리 분기 - * -처리방안: 팝업 페이지 열람 시 ajax 처리 - * submit 열람 시 submit 처리 - */ - if('${param.tilesDef}'=='popup'){ + /* ajax 처리 Pattern */ if (confirm('등록하시겠습니까?')) { var param = new FormData($('#board')[0]); @@ -255,13 +245,7 @@ } }); } - }else{ - /* submit 처리 Pattern */ - if (confirm('등록하시겠습니까?')) { - document.board.action = ""; - document.board.submit(); - } - } + }, /* ======================== diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_list.jsp index d205ad86..e5a9182f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_list.jsp @@ -296,9 +296,9 @@ var XitBasicBbsMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp index 292f4164..cfbdf251 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBasicBbsMng_view.jsp @@ -152,15 +152,11 @@ 답글작성 - - - + 닫기 - - + 목록 - - + @@ -264,13 +260,7 @@ return; } - /** - * 페이지 Open 방식에 따라 처리 분기(일반페이지 or 팝업페이지) - * -사유: 기존 구현된 일반페이지 -> 팝업페이지로 변경함에 따라 사용자 니즈에 맞춰 사용할 수 있도록 페이지 Open 방식에 따라 처리 분기 - * -처리방안: 팝업 페이지 열람 시 ajax 처리 - * submit 열람 시 submit 처리 - */ - if('${param.tilesDef}'=='popup'){ + /* ajax 처리 Pattern */ if (confirm('삭제하시겠습니까?')) { var param = $(document.frm).serialize(); @@ -289,13 +279,7 @@ } }); } - }else{ - /* submit 처리 Pattern */ - if (confirm('삭제하시겠습니까?')) { - document.frm.action = ""; - document.frm.submit(); - } - } + }, /* ======================== diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsCreateMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsCreateMng_list.jsp index da59ff01..32d6290a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsCreateMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsCreateMng_list.jsp @@ -146,9 +146,9 @@ var XitBbsCreateMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_edit.jsp index a1d77d21..c891a8a8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_edit.jsp @@ -131,7 +131,7 @@ var XitBbsTmplateMng_edit = { } if (target != "") { - window.open(target + "?searchWrd="+url+"&tilesDef=popup", "preview", "width=" + width + "px, height=500px;"); + window.open(target + "?searchWrd="+url, "preview", "width=" + width + "px, height=500px;"); } } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_input.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_input.jsp index 8f693302..8c1296f3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_input.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_input.jsp @@ -148,7 +148,7 @@ var XitBbsTmplateMng_input = { } if (target != "") { - window.open(target + "?searchWrd="+url+"&tilesDef=popup", "preview", "width=" + width + "px, height=500px;"); + window.open(target + "?searchWrd="+url, "preview", "width=" + width + "px, height=500px;"); } } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_list.jsp index 8f8dbf5c..d6a4592c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsTmplateMng_list.jsp @@ -139,9 +139,8 @@ var XitBbsTmplateMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsUseMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsUseMng_edit.jsp index 83f11ced..4de8df65 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsUseMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/XitBbsUseMng_edit.jsp @@ -76,7 +76,7 @@ 제공 URL - " target="_blank"> + " target="_blank"> diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/backup/XitBbsTmplateMng_edit.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/backup/XitBbsTmplateMng_edit.jsp index dc93bb22..ed381557 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/backup/XitBbsTmplateMng_edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/backup/XitBbsTmplateMng_edit.jsp @@ -52,7 +52,7 @@ } if (target != "") { - window.open(target + "?searchWrd="+url+"&tilesDef=popup", "preview", "width=" + width + "px, height=500px;"); + window.open(target + "?searchWrd="+url, "preview", "width=" + width + "px, height=500px;"); } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplPreviewPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplPreviewPopup.jsp index fbf0bde4..8b7a0573 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplPreviewPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardTmplPreviewPopup.jsp @@ -290,9 +290,9 @@ ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtPopup.jsp index 32e8acb2..bcbbac38 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/bbs/mngBoardUseMgtPopup.jsp @@ -71,7 +71,7 @@ 제공 URL - " target="_blank"> + " target="_blank"> diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitClCodeMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitClCodeMng_list.jsp index 8739b9ec..2a70eda3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitClCodeMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitClCodeMng_list.jsp @@ -136,9 +136,9 @@ var XitClCodeMng_list = { ======================== */ ,pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list.jsp index 61f8e60d..7f21c44d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitCmmnCodeMng_list.jsp @@ -132,9 +132,9 @@ var XitCmmnCodeMng_list = { ======================== */ ,pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_list.jsp index 226e5e31..cb449ebb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/code/backup/XitDetailCodeMng_list.jsp @@ -137,9 +137,9 @@ var XitDetailCodeMng_list = { ======================== */ ,pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/backup/XitMenuCreateMng_list2.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/backup/XitMenuCreateMng_list2.jsp index 97f215ea..c19824ec 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/backup/XitMenuCreateMng_list2.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/menu/backup/XitMenuCreateMng_list2.jsp @@ -45,12 +45,10 @@ function selectMenuCreatManageList() { ******************************************************** */ function selectMenuCreat(vAuthorCode) { document.menuCreatManageForm.authorCode.value = vAuthorCode; - document.menuCreatManageForm.tilesDef.value = 'popup'; //tiles 설정 document.menuCreatManageForm.action = ""; window.open("#", "_menuCreat", "scrollbars = yes, top=100px, left=100px, height=700px, width=850px"); document.menuCreatManageForm.target = "_menuCreat"; - document.menuCreatManageForm.submit(); - document.menuCreatManageForm.tilesDef.value = ''; //tiles 초기화 + document.menuCreatManageForm.submit(); document.menuCreatManageForm.target = ""; //target 초기화 } @@ -69,7 +67,6 @@ function selectMenuCreat(vAuthorCode) {
- diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserAbsntMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserAbsntMng_list.jsp index f8a03b17..cf457744 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserAbsntMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserAbsntMng_list.jsp @@ -162,9 +162,9 @@ var XitUserAbsntMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserEtcOptMng_list.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserEtcOptMng_list.jsp index 3e1955e7..53eb6803 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserEtcOptMng_list.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserEtcOptMng_list.jsp @@ -215,9 +215,9 @@ var XitUserEtcOptMng_list = { ======================== */ pagePopup: function(flag, url, params){ var popUrl = url; - popUrl += "?tilesDef=popup"; + if(!(params == undefined || params == null)){ - popUrl += "&"; + popUrl += "?"; popUrl += params; } var popTitle = ''; diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserRegMng_editPwd_popup.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserRegMng_editPwd_popup.jsp index 16445311..6c1c9872 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserRegMng_editPwd_popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/XitUserRegMng_editPwd_popup.jsp @@ -11,7 +11,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_editPwd.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_editPwd.jsp index 8f843071..d4709b85 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_editPwd.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_editPwd.jsp @@ -55,7 +55,7 @@ function fnUpdate(){ - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp index 8480007e..e56eba4a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/framework/biz/mng/usr/backup/XitUserRegMng_view.jsp @@ -129,7 +129,6 @@ table { - diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-inner.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-inner.jsp similarity index 94% rename from src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-inner.jsp rename to src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-inner.jsp index 9385bca3..07b0a622 100644 --- a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-inner.jsp +++ b/src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-inner.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %> + <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-org.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-org.jsp similarity index 96% rename from src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-org.jsp rename to src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-org.jsp index df211b11..e8009ddf 100644 --- a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-org.jsp +++ b/src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-org.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %> + <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-pop.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-pop.jsp similarity index 88% rename from src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-pop.jsp rename to src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-pop.jsp index 5ef88554..79db4461 100644 --- a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-pop.jsp +++ b/src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-pop.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %> + <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-root.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-root.jsp similarity index 96% rename from src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-root.jsp rename to src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-root.jsp index 73126871..434e6777 100644 --- a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-biz-root.jsp +++ b/src/main/webapp/WEB-INF/jsp/template/fims/layout-biz-root.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %> + <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-dashboard.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/layout-dashboard.jsp similarity index 93% rename from src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-dashboard.jsp rename to src/main/webapp/WEB-INF/jsp/template/fims/layout-dashboard.jsp index 821a34bf..2a2e0de2 100644 --- a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/biz/layout-tiles-dashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/template/fims/layout-dashboard.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %> + <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/popup/layout-tiles-popup.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/layout-popup.jsp similarity index 61% rename from src/main/webapp/WEB-INF/jsp/template/fims/tiles/popup/layout-tiles-popup.jsp rename to src/main/webapp/WEB-INF/jsp/template/fims/layout-popup.jsp index 009e2efc..5989f733 100644 --- a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/popup/layout-tiles-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/template/fims/layout-popup.jsp @@ -1,5 +1,5 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %> + <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> @@ -24,29 +24,6 @@ <%@include file="/WEB-INF/jsp/include/fims/tail-biz.jsp" %> - diff --git a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/none/layout-tiles-none.jsp b/src/main/webapp/WEB-INF/jsp/template/fims/tiles/none/layout-tiles-none.jsp deleted file mode 100644 index 14f45d91..00000000 --- a/src/main/webapp/WEB-INF/jsp/template/fims/tiles/none/layout-tiles-none.jsp +++ /dev/null @@ -1,4 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> -<%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %> - - diff --git a/src/main/webapp/resources/js/fims/biz/layout/myView.js b/src/main/webapp/resources/js/fims/biz/layout/myView.js index cdc5c8c7..24dd811c 100644 --- a/src/main/webapp/resources/js/fims/biz/layout/myView.js +++ b/src/main/webapp/resources/js/fims/biz/layout/myView.js @@ -11,8 +11,6 @@ function fn_goMyView(uniqId, userSe) { let popOption = ''; let params = { selectedId: uniqId - //TODO : 개발완료후 이부분 제거 - ,tilesDef: 'popup' }; popUrl = "/framework/biz/mng/usr/modifyUserPopup.do";