jhleem / egov star

이다솜 이다솜 2022-02-16 @70

[20220216 이다솜] 코밋
Index: base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleController.java =================================================================== --- base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleController.java (revision 69) +++ base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleController.java (revision 70) @@ -307,6 +307,7 @@ @ModelAttribute("bdMstr") BoardMaster bdMstr, @ModelAttribute("board") BoardVO board, BindingResult bindingResult, @PathVariable String bbsId, ModelMap model) throws Exception { + boardVO.setBbsId("BBSMSTR_".concat(bbsId)); LoginVO user = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); @@ -316,7 +317,6 @@ beanValidator.validate(board, bindingResult); if (bindingResult.hasErrors()) { - BoardMasterVO master = new BoardMasterVO(); master.setBbsId(boardVO.getBbsId()); @@ -348,7 +348,7 @@ // result = fileUtil.parseFileInf(files, "BBS_", 0, "", ""); // atchFileId = fileMngService.insertFileInfs(result); } - board.setAtchFileId(atchFileId); + board.setAtchFileId(boardVO.getAtchFileId()); board.setFrstRegisterId((user == null || user.getUniqId() == null) ? "" : user.getUniqId()); board.setBbsId(boardVO.getBbsId()); board.setBlogId(boardVO.getBlogId()); @@ -479,7 +479,7 @@ // atchFileId = fileMngService.insertFileInfs(result); } - board.setAtchFileId(atchFileId); + board.setAtchFileId(boardVO.getAtchFileId()); board.setReplyAt("Y"); board.setFrstRegisterId((user == null || user.getUniqId() == null) ? "" : user.getUniqId()); board.setBbsId(board.getBbsId()); Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleUpdt.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleUpdt.jsp (revision 69) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleUpdt.jsp (revision 70) @@ -187,7 +187,6 @@ <input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>" /> <input name="searchKeyword" type="hidden" value="${searchVO.searchKeyword}" /> - <input name="searchCondition" type="hidden" value="${searchVO.searchCondition}" /> <input type="hidden" name="bbsTyCode" value="<c:out value='${boardMasterVO.bbsTyCode}'/>" /> <input type="hidden" name="replyPosblAt" value="<c:out value='${boardMasterVO.replyPosblAt}'/>" /> <input type="hidden" name="fileAtchPosblAt" value="<c:out value='${boardMasterVO.fileAtchPosblAt}'/>" /> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp (revision 69) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp (revision 70) @@ -143,13 +143,13 @@ <strong class="board_label">첨부파일</strong> <div class="file_up"> <div> - <input name="file_1" id="egovComFileUploader" type="file" class="blind userUpload" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" multiple/><!-- 첨부파일 --> - <input type="hidden" id="atchFileId" name="atchFileId" value="" /> - <label for="egovComFileUploader" class="inputFile" title="업로드 할 파일을 선택해주세요">파일업로드<span class="icon-file"></span></label> + <input name="file_1" id="egovComFileUploader" type="file" class="blind userUpload" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" multiple /> + <!-- 첨부파일 --> + <input type="hidden" id="atchFileId" name="atchFileId" value="" /> + <label for="egovComFileUploader" class="inputFile" title="업로드 할 파일을 선택해주세요">파일업로드</label> </div> - <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> - <ul class="file_list" id="egovComFileList"> - </ul> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> + <div class="file_list" id="egovComFileList"></div> </div> </li> </c:if> @@ -168,12 +168,11 @@ <input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"/> <input name="searchKeyword" type="hidden" value="${searchVO.searchKeyword}" /> - <input name="searchCondition" type="hidden" value="${searchVO.searchCondition}" /> <input type="hidden" name="bbsTyCode" value="<c:out value='${boardMasterVO.bbsTyCode}'/>" /> <input type="hidden" name="replyPosblAt" value="<c:out value='${boardMasterVO.replyPosblAt}'/>" /> <input type="hidden" name="fileAtchPosblAt" value="<c:out value='${boardMasterVO.fileAtchPosblAt}'/>" /> <input type="hidden" id="atchPosblFileNumber" name="atchPosblFileNumber" value="<c:out value='${boardMasterVO.atchPosblFileNumber}'/>" /> - <input type="hidden" name="atchPosblFileSize" value="<c:out value='${boardMasterVO.atchPosblFileSize}'/>" /> + <input type="hidden" id="atchPosblFileSize" name="atchPosblFileSize" value="<c:out value='${boardMasterVO.atchPosblFileSize}'/>" /> <input type="hidden" name="parnts" value="<c:out value='${result.parnts}'/>" /> <input type="hidden" name="sortOrdr" value="<c:out value='${result.sortOrdr}'/>" /> @@ -190,14 +189,14 @@ var atchPosblFileNumber = $('#atchPosblFileNumber').val(); var atchPosblFileSize = $('#atchPosblFileSize').val(); var options = { - fileListDivId : 'egovComFileList', - inputFileId : 'egovComFileUploader', - hiddenFileName : 'atchFileId', - txtAreaId : 'nttCn', - authorType : 'user', - maxSize: atchPosblFileNumber, - fileMaxSize: atchPosblFileSize - } + fileListDivId : 'egovComFileList', + inputFileId : 'egovComFileUploader', + hiddenFileName : 'atchFileId', + txtAreaId : 'nttCn', + authorType : 'user', + maxSize : atchPosblFileNumber, + fileMaxSize : atchPosblFileSize + } $('#nttCn').initEditor(options); /* 비밀글 설정시 비밀번호입력창 show */ Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleRegist.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleRegist.jsp (revision 69) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleRegist.jsp (revision 70) @@ -192,13 +192,12 @@ </div> <input type="hidden" name="pageIndex" value="<c:out value='${searchVO.pageIndex}'/>"/> - <input name="searchKeyword" type="hidden" value="${searchVO.searchKeyword}" /> - <input name="searchCondition" type="hidden" value="${searchVO.searchCondition}" /> + <input type="hidden" name="searchKeyword" value="${searchVO.searchKeyword}" /> <input type="hidden" name="bbsTyCode" value="<c:out value='${boardMasterVO.bbsTyCode}'/>" /> <input type="hidden" name="replyPosblAt" value="<c:out value='${boardMasterVO.replyPosblAt}'/>" /> <input type="hidden" name="fileAtchPosblAt" value="<c:out value='${boardMasterVO.fileAtchPosblAt}'/>" /> <input type="hidden" id="atchPosblFileNumber" name="atchPosblFileNumber" value="<c:out value='${boardMasterVO.atchPosblFileNumber}'/>" /> - <input type="hidden" name="atchPosblFileSize" value="<c:out value='${boardMasterVO.atchPosblFileSize}'/>" /> + <input type="hidden" id="atchPosblFileSize" name="atchPosblFileSize" value="<c:out value='${boardMasterVO.atchPosblFileSize}'/>" /> <input type="hidden" name="blogId" value="<c:out value='${searchVO.blogId}'/>" /> <input type="hidden" name="blogAt" value="<c:out value='${articleVO.blogAt}'/>"/> <input type="hidden" name="cmd" value="<c:out value='save'/>"> @@ -218,7 +217,8 @@ txtAreaId : 'nttCn', authorType : 'user', maxSize: atchPosblFileNumber, - fileMaxSize: atchPosblFileSize + fileMaxSize: atchPosblFileSize, + fileAllowedTypes: ['*'] } $('#nttCn').initEditor(options); @@ -239,7 +239,7 @@ $pwDiv.hide(); } }); -}); +}); </script> <!-- 첨부파일 업로드 가능화일 설정 End.-->
Add a comment
List