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

Merge branch 'tolag3'

Browse Source
This commit is contained in:
leejunho 2024-08-06 16:24:12 +09:00
commit c4db48a377
4 changed files with 55 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/kcc/let/sym/mnu/mcm/web/EgovMenuCreateManageController.java
View File

@ -540,6 +540,9 @@ public class EgovMenuCreateManageController {
ModelAndView modelAndView = new ModelAndView();
modelAndView.setViewName("jsonView");
int cnt = 0;
if(true) return new ModelAndView();
try{
try{
if(!menuManageVO.getTmp_Id().equals(menuManageVO.getMenuNo()+"")){ //매뉴번호 변경시
@ -570,6 +573,24 @@ public class EgovMenuCreateManageController {
}*/
boolean delFlag = false;
/*
* menuManageVO.getMenuType
* M : 메뉴
* P : 프로그램
* C : HTML컨텐츠
* B : 게시판
* O : 외부링크
*
*/
/*
* menuManageVO.getTmp_Name
* M : 메뉴
* P : 프로그램
* C : HTML컨텐츠
* B : 게시판
* O : 외부링크
*
*/
if(!menuManageVO.getMenuType().equals("M") && menuManageVO.getTmp_Name().equals("dir")){ //디렉토리 폴더에서 프로그램으로 바꿀경우 프로그램 목록 insert
searchVO.setSearchKeyword(progrmManageVO.getProgrmFileNm());
if(progrmManageService.selectProgrm(searchVO) != null){ //중복 프로그램 이름 확인

12
src/main/java/kcc/let/sym/mnu/mpm/service/MenuManageVO.java
View File

@ -1,5 +1,7 @@
package kcc.let.sym.mnu.mpm.service;
import java.util.List;
import org.apache.commons.lang3.builder.ToStringBuilder;
import kcc.com.cmm.ComDefaultVO;
@ -114,6 +116,8 @@ public class MenuManageVO extends ComDefaultVO{
private String chkURL;
private List<String> authorChkList;
/**
* menuNo attribute를 리턴한다.
* @return int
@ -528,6 +532,14 @@ public class MenuManageVO extends ComDefaultVO{
public void setChkURL(String chkURL) {
this.chkURL = chkURL;
}
public List<String> getAuthorChkList() {
return authorChkList;
}
public void setAuthorChkList(List<String> authorChkList) {
this.authorChkList = authorChkList;
}
}

20
src/main/resources/egovframework/spring/com/context-security.xml
View File

@ -71,18 +71,20 @@
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'url'
ORDER BY a.ROLE_SORT"
/> -->
<egov-security:secured-object-config id="securedObjectConfig"
roleHierarchyString="
<!-- roleHierarchyString="
ROLE_ADMIN > ROLE_ADMIN2
ROLE_ADMIN2 > ROLE_ANONYMOUS
"
" -->
<egov-security:secured-object-config id="securedObjectConfig"
sqlHierarchicalRoles="
SELECT a.CHLDRN_ROLE child, a.PARNTS_ROLE parent
FROM LETTNROLES_HIERARCHY a LEFT JOIN LETTNROLES_HIERARCHY b on (a.CHLDRN_ROLE = b.PARNTS_ROLE)"
sqlRolesAndUrl="
SELECT a.ROLE_PTTRN url, b.AUTHOR_CODE authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'url'
ORDER BY TO_NUMBER(a.ROLE_SORT)"
sqlRolesAndUrl="
SELECT a.ROLE_PTTRN url, b.AUTHOR_CODE authority
FROM LETTNROLEINFO a, LETTNAUTHORROLERELATE b
WHERE a.ROLE_CODE = b.ROLE_CODE AND a.ROLE_TY = 'url'
ORDER BY TO_NUMBER(a.ROLE_SORT)"
/>
<egov-security:initializer id="initializer" supportMethod="false" supportPointcut="false" />

123
src/main/webapp/WEB-INF/jsp/sym/mnu/mpm/EgovMenuCreatSelectJtree.jsp
View File

@ -37,6 +37,11 @@
* jstree
*********************************
*/
$( document ).ready(function() {
jstreeInit();
});
var newNodeId = "";
function jstreeInit() {
$('#itn_organization').jstree({
@ -283,10 +288,6 @@ function jstreeInit() {
}
$( document ).ready(function() {
jstreeInit();
});
//메뉴 정보 세팅
function fn_select_menuNo(menuManageVO, menuUserTypeList, authorList){
var tmpHtml = "";
@ -361,14 +362,14 @@ function fn_select_menuNo(menuManageVO, menuUserTypeList, authorList){
if(menuManageVO.menuNo > 10){
$('#menuOpen').show();
var checkField = $("input[name=checkField]");
var authorChkList = $("input[name=authorChkList]");
$("input[name=checkField]").prop('checked', false);
$("input[name=authorChkList]").prop('checked', false);
for(var i = 0 ; i < checkField.size() ; i++){
for(var i = 0 ; i < authorChkList.size() ; i++){
for(var j = 0 ; j < authorList.length ; j++){
if(checkField[i].id == authorList[j].authorCode){
checkField[i].checked = true;
if(authorChkList[i].id == authorList[j].authorCode){
authorChkList[i].checked = true;
}
}
}
@ -472,16 +473,6 @@ function fn_save_menuInfo(menuNo) {
if(!confirm("저장하시겠습니까?")) return;
<%-- 전자조정
//추가 게시판 저장후 메뉴 정보 저장
//if( $('#tr_bbs').length > 0 ){
if(!save_line()){
console.log();
return;
}
//}
--%>
var url = "";
url = "<c:url value='/sym/mnu/mcm/EgovMenuInfoUpdateAjax.do'/>";
var params = $(menuForm).serialize();
@ -613,23 +604,6 @@ function searchContentList() {
document.searchForm.action= "/sym/mnu/mcm/EgovMenuCreatSelectJtree.do";
}
/* ********************************************************
* 사용자 메뉴 담당자 조회 함수
******************************************************** */
function searchManageMenuList() {
var popupX = scX + (docWidth - 185) / 2;
var popupY = scY + (docHeight - 195) / 2;
memuPopup = window.open('', 'memuPopup', "width=800, height=730, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no");
document.searchForm.method = "post";
document.searchForm.action = "/uss/umt/user/EgovUserManageMenuAjax.do";
document.searchForm.target = "memuPopup" ;
document.searchForm.submit();
document.searchForm.target = "_self" ;
document.searchForm.action= "/sym/mnu/mcm/EgovMenuCreatSelectJtree.do";
}
function onkeyContentName(event){
var tempContentUrl = "/web/content.do?proFn=" ;
if($("#menuType option:selected").val()=="C"){
@ -679,70 +653,6 @@ function delete_line(obj){
set_count();
}
function save_line() {
/* if(0== $('.tr_item').size()){
alert("선택된 게시판이 없습니다.");
return;
} */
//빈 게시판 방지
var blank_tr = false;
var blank_sort = false;
$('.tr_item').each(function() {
if(""==$(this).find('input[name^=bbsTxt]').val()){
blank_tr = true;
}
if(""==$(this).find('input[name^=bbsSort]').val()){
blank_sort = true;
}
});
if(blank_tr) {
alert("비어 있는 게시판이 있습니다.");
return false;
}
if(blank_sort) {
alert("게시판 순서를 넣어주세요.");
return false;
}
var save_line_return = false;
var frm = document.menuForm;
var data = new FormData(frm);
$.ajax({
type: "POST",
url: "/sym/mnu/mcm/MenuBbsInsertAjax.do",
data: data,
dataType:'json',
processData: false,
contentType: false,
async: false,
cache: false,
timeout: 600000,
success: function (returnData, status) {
if(status == 'success'){
if(returnData.status == 'fail'){
alert("게시판 등록 실패하였습니다.");
}else if(returnData.status == 'auth_fail'){
alert("세션이 종료되었습니다.");
}else if(returnData.status =='success'){
//alert("등록되었습니다.");
save_line_return = true;
}
}else{
alert("등록에 실패하였습니다.");
return false;
}
},
error: function (e) {
console.log("ERROR : ", e);
alert("등록에 실패하였습니다.");
}
});
return save_line_return;
}
function htmlComfirm(progrmHtmlFileId) {
$.ajax({
type: "POST",
@ -965,7 +875,7 @@ function set_bbs(){
<div>
<%-- <input type="checkbox" id="${authorList.authorCode}" name="${authorList.authorCode}" value="${authorList.authorCode}"/>
<label for="${authorList.authorCode}"> ${authorList.authorNm} </label> --%>
<input name="checkField" id="<c:out value="${authorList.authorCode}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox"/>
<input name="authorChkList" id="<c:out value="${authorList.authorCode}"/>" title="Check <c:out value="${status.count}"/>" type="checkbox" value="${authorList.authorCode}"/>
<label for="<c:out value="${authorList.authorCode}"/>" style="position: unset;"><c:out value="${authorList.authorCode}"/></label>
</div>
</c:forEach>
@ -986,7 +896,6 @@ function set_bbs(){
</table>
</div>
</div>
<!-- btn_wrap -->
<div class="btn_wrap btn_layout01">
@ -1005,7 +914,6 @@ function set_bbs(){
<!-- //cont -->
</form>
<table id="eva_temp_table" style="display:none">
<tr id="temp_tr">
<td>
@ -1022,12 +930,3 @@ function set_bbs(){
</table>
</body>
</html>