somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

중간 백업

Browse Source
This commit is contained in:
KNKIM 2021-12-14 18:10:01 +09:00
parent 6f87294da7
commit d07e5976c3
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp
View File

@ -94,21 +94,12 @@ $(window.document).ready(function() {
var re = /(?:\.([^.]+))?$/;
<c:forEach var="attachFile" items="${searchArticle.attachFiles }" varStatus="status">
myDropzone.addFile({
<<<<<<< HEAD
name: '<c:out value="${attachFile.orignlFileNm}" />',
size: <c:out value="${attachFile.fileSize}" />,
type:re.exec('<c:out value="${attachFile.orignlFileNm}" />')[1],
attachFileId: '<c:out value="${attachFile.attachFileId}" />',
streFileNm: '<c:out value="${attachFile.streFileNm}" />',
fileSn: '<c:out value="${attachFile.fileSn}" />',
=======
name: '<c:out value='${attachFile.orignlFileNm}'/>',
size:<c:out value='${attachFile.fileSize}'/>,
type:re.exec('<c:out value='${attachFile.orignlFileNm}'/>')[1],
attachFileId: '<c:out value='${attachFile.attachFileId}'/>',
streFileNm: '<c:out value='${attachFile.streFileNm}'/>',
fileSn: '<c:out value='${attachFile.fileSn}'/>',
>>>>>>> refs/remotes/origin/master
fileUploadType: 'uploaded'
});
</c:forEach>

2
src/main/webapp/WEB-INF/jsp/nlib/bbs/listQnas.jsp
View File

@ -38,7 +38,7 @@
$( document ).ready(function() {
fn_setPageTitle("Q&A");
fn_setPageTitle("<c:out value='${pageTitle}'/>");
// 검색 수행 이벤트
$("#btnSearch").on("click", function(e) {