From 96ee07e0bce8d0be34d07c06abc4f79d160752a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Tue, 11 Jan 2022 17:46:51 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=EC=9E=90=EB=A3=8C=EB=93=B1=EB=A1=9D=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99=EC=8B=9C=20=EB=B6=84=EB=A5=98=20=EC=9E=90?=
 =?UTF-8?q?=EB=8F=99=20=EC=84=A0=ED=83=9D.=20=EC=82=AD=EC=A0=9C=20?=
 =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EB=B3=B4=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BoardController.java           |  4 +--
 .../resources/mybatisMapper/BoardMapper.xml   |  6 ++---
 src/main/resources/static/js/admin/userMgt.js |  2 --
 .../resources/static/js/board/contentList.js  | 21 ---------------
 .../resources/static/js/board/contentWrite.js |  7 +++++
 src/main/resources/static/js/common.js        | 26 ++++++++++++++++++-
 .../templates/board/contentList.html          |  3 +++
 .../templates/board/contentWrite.html         |  1 +
 .../templates/fragments/leftMenu.html         |  2 +-
 9 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java
index 8532d6a..4344193 100644
--- a/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java
+++ b/src/main/java/com/dbnt/kcgfilemanager/controller/BoardController.java
@@ -48,7 +48,7 @@ public class BoardController {
   }
 
   @GetMapping("/contentWrite")
-  public ModelAndView contentWrite(@AuthenticationPrincipal UserInfo loginUser, Board content) {
+  public ModelAndView contentWrite(@AuthenticationPrincipal UserInfo loginUser, Board content, Integer categorySeq) {
     ModelAndView mav = new ModelAndView("board/contentWrite");
     if(content.getContentSeq() == null) {
       mav.addObject("type", "new");
@@ -58,7 +58,7 @@ public class BoardController {
       mav.addObject("type", "modify");
       mav.addObject("content", boardService.selectContentModifyInfo(content.getContentSeq()));
     }
-
+    mav.addObject("categorySeq", categorySeq);
     mav.addObject("userRole", loginUser.getUserRole());
     CategoryRole categoryRole = new CategoryRole();
     categoryRole.setUserSeq(loginUser.getUserSeq());
diff --git a/src/main/resources/mybatisMapper/BoardMapper.xml b/src/main/resources/mybatisMapper/BoardMapper.xml
index a622d7f..ca0bdc5 100644
--- a/src/main/resources/mybatisMapper/BoardMapper.xml
+++ b/src/main/resources/mybatisMapper/BoardMapper.xml
@@ -27,7 +27,7 @@
       INNER JOIN CONTENT_POSITION D
         ON A.CATEGORY_SEQ = D.CATEGORY_SEQ
     </if>
-    <where>
+    WHERE A.STATUS != 'D'
       <if test="status != null and status != ''">
         AND A.STATUS = #{status}
       </if>
@@ -71,7 +71,6 @@
           WHERE ORIGINAL_NAME LIKE CONCAT('%', #{originalName}, '%')
         )
       </if>
-    </where>
     <if test='status == "M"'>
       ORDER BY A.VIEW_CNT DESC
     </if>
@@ -96,7 +95,7 @@
       INNER JOIN CONTENT_POSITION D
       ON A.CATEGORY_SEQ = D.CATEGORY_SEQ
     </if>
-    <where>
+    WHERE A.STATUS != 'D'
       <if test="status != null and status != ''">
         AND A.STATUS = #{status}
       </if>
@@ -140,7 +139,6 @@
         WHERE ORIGINAL_NAME LIKE CONCAT('%', #{originalName}, '%')
         )
       </if>
-    </where>
   </select>
 
   <select id="selectHashTagListFromContentSeq" resultType="HashTag" parameterType="int">
diff --git a/src/main/resources/static/js/admin/userMgt.js b/src/main/resources/static/js/admin/userMgt.js
index 555c8e1..6a7104d 100644
--- a/src/main/resources/static/js/admin/userMgt.js
+++ b/src/main/resources/static/js/admin/userMgt.js
@@ -1,6 +1,4 @@
 $(function(){
-  setSearchCondition();
-
   $("#dateSelectorDiv").datepicker({
     format: "yyyy-mm-dd",
     language: "ko"
diff --git a/src/main/resources/static/js/board/contentList.js b/src/main/resources/static/js/board/contentList.js
index 38bb073..9caee70 100644
--- a/src/main/resources/static/js/board/contentList.js
+++ b/src/main/resources/static/js/board/contentList.js
@@ -130,24 +130,3 @@ function getBoardLog(contentSeq){
     });
   }
 }
-
-function setMenu(){
-  const categorySeq = getParam("categorySeq");
-  openMenu($("[data-categoryseq='"+categorySeq+"']").attr("data-parentseq"));
-}
-
-function getParam(sname) {
-  const paramAry = location.search.substr(1).split("&");
-  for (let i = 0; i < paramAry.length; i++) {
-    const param = paramAry[i].split("=");
-    if (param[0] === sname) { return param[1]; }
-  }
-}
-
-function openMenu(parentSeq){
-  if(parentSeq){
-    const target = $("[data-categoryseq='"+parentSeq+"']")
-    target.click();
-    openMenu(target.attr("data-parentseq"));
-  }
-}
\ No newline at end of file
diff --git a/src/main/resources/static/js/board/contentWrite.js b/src/main/resources/static/js/board/contentWrite.js
index 0535e7d..73d7ac0 100644
--- a/src/main/resources/static/js/board/contentWrite.js
+++ b/src/main/resources/static/js/board/contentWrite.js
@@ -5,6 +5,13 @@ $(function(){
     $(".categorySelector").removeAttr("disabled");
     setParentCategory(4, $("#categorySeq").find("[selected]").attr("data-parentseq"));
   }
+  if(categorySeq !== undefined){
+    setMenu();
+    $(".categorySelector").removeAttr("disabled");
+    const selector = $("#categorySeq").find("[value='"+categorySeq+"']")
+    selector[0].selected = true;
+    setParentCategory(4, selector.attr("data-parentseq"));
+  }
 
   $("#uploadDiv").on("dragenter", function(e) {
     // $(this).addClass('drag-over');
diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js
index aeb163c..6c52137 100644
--- a/src/main/resources/static/js/common.js
+++ b/src/main/resources/static/js/common.js
@@ -1,12 +1,36 @@
+let categorySeq;
+
 $(document).on('click', '#moveRightBtn', function (){
   moveCategorySelectBody(1);
 })
 $(document).on('click', '#moveLeftBtn', function (){
   moveCategorySelectBody(-1);
 })
-
+$(document).on('click', '#contentWriteBtn', function (){
+  location.href="/board/contentWrite"+(categorySeq!==undefined?("?categorySeq="+categorySeq):"");
+})
 function moveCategorySelectBody(direction){
   const categorySelectBody = $("#categorySelectBody");
   const nowX = categorySelectBody.scrollLeft();
   categorySelectBody.animate({scrollLeft:(direction*200+nowX)},200);
+}
+function setMenu(){
+  const categorySeq = getParam("categorySeq");
+  openMenu($("[data-categoryseq='"+categorySeq+"']").attr("data-parentseq"));
+}
+
+function getParam(sname) {
+  const paramAry = location.search.substr(1).split("&");
+  for (let i = 0; i < paramAry.length; i++) {
+    const param = paramAry[i].split("=");
+    if (param[0] === sname) { return param[1]; }
+  }
+}
+
+function openMenu(parentSeq){
+  if(parentSeq){
+    const target = $("[data-categoryseq='"+parentSeq+"']")
+    target.click();
+    openMenu(target.attr("data-parentseq"));
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/templates/board/contentList.html b/src/main/resources/templates/board/contentList.html
index b15fb5d..65c76fb 100644
--- a/src/main/resources/templates/board/contentList.html
+++ b/src/main/resources/templates/board/contentList.html
@@ -3,6 +3,9 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
+  <script type="text/javascript">
+    categorySeq = [[${searchParams.categorySeq}]];
+  </script>
   <script type="text/javascript" th:src="@{/js/board/contentList.js}"></script>
 </th:block>
 <div layout:fragment="content">
diff --git a/src/main/resources/templates/board/contentWrite.html b/src/main/resources/templates/board/contentWrite.html
index 2e59cb8..78f1822 100644
--- a/src/main/resources/templates/board/contentWrite.html
+++ b/src/main/resources/templates/board/contentWrite.html
@@ -12,6 +12,7 @@
 <th:block layout:fragment="script">
   <script type="text/javascript">
     const pageType = '[[${type}]]';
+    categorySeq = [[${categorySeq}]];
   </script>
   <script type="text/javascript" th:src="@{/js/board/contentWrite.js}"></script>
 </th:block>
diff --git a/src/main/resources/templates/fragments/leftMenu.html b/src/main/resources/templates/fragments/leftMenu.html
index 6d1b584..6efdb94 100644
--- a/src/main/resources/templates/fragments/leftMenu.html
+++ b/src/main/resources/templates/fragments/leftMenu.html
@@ -17,7 +17,7 @@
       <a class="btn btn-primary" href="/board/contentSearch"><i class="bi bi-search"></i> 통합 검색</a>
     </div>
     <div class="d-grid gap-2 pt-1">
-      <a class="btn btn-success" href="/board/contentWrite"><i class="bi bi-file-earmark-plus "></i> 자료 등록</a>
+      <a class="btn btn-success" id="contentWriteBtn"><i class="bi bi-file-earmark-plus "></i> 자료 등록</a>
     </div>
     <div sec:authorize="isAuthenticated()">
       <div class="flex-shrink-0 pe-3 py-3 bg-transparent">