From 9ff3e8c43d01f758381b4925cff44502f1241750 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 14:26:36 +0900
Subject: [PATCH] - 일반 사용자로 검색 기능 제대로 동작안되는 문제 해결 - 이슈 유형에서 사용중인 프로젝트는 삭제 불가 - 이슈 유형에서 프로젝트 검색 시 워크스페이스 관리자는 모든 프로젝트 검색 가능(기존엔 참여하고있는 프로젝트만 검색가능하게되어있었음)

---
 src/main/webapp/scripts/app/issue/issueList.controller.js |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 5ce58c6..46c4c54 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -52,10 +52,11 @@
                     issueTypeId : "",
                     partnerVos : "",
                     search : {
-                        keyWord : "", //  �쟾泥� 寃��깋
+                        keyWord : "", //  寃��깋
                         title : "", //  �젣紐�
                         description : "",   //  �궡�슜
                         combinationIssueNumber : "",   //  �씠�뒋 踰덊샇
+                        issueNumber : "",
                         projectType : "BTS_PROJECT",    //  �봽濡쒖젥�듃 �쑀�삎
                         registerDateRange : "", //  �벑濡앹씪 湲곌컙 寃��깋
                         startDateRange : "",    //  �떆�옉�씪 湲곌컙 寃��깋
@@ -64,6 +65,9 @@
                         priorityIds : [],   //  �슦�꽑�닚�쐞 寃��깋
                         issueStatusIds : [],    //  �씠�뒋 �긽�깭 寃��깋
                         issueTypeIds : []   //  �씠�뒋 �쑀�삎 寃��깋
+                    },
+                    searchAll : {
+                        keyWord : "", //  �쟾泥� 寃��깋
                     },
                     searchView : false, //  �긽�꽭 寃��깋 議곌굔 �몴�떆 �뿬遺�
                     detailView : false, //  �긽�꽭 紐⑤뱶 蹂�寃� 媛�
@@ -129,8 +133,8 @@
                 });
 
                 // �긽�떒 寃��깋�떆
-                $scope.$on("searchIssueList", function (event, args) {
-                    $scope.vm.search.keyWord = args.keyWord;
+                $rootScope.$on("searchIssueList", function (event, args) {
+                    $scope.vm.searchAll.keyWord = args.keyWord;
                     $scope.fn.getPageList(0);
                 });
 
@@ -453,6 +457,7 @@
                         keyWord : $scope.vm.search.keyWord,
                         title : $scope.vm.search.title,
                         description : $scope.vm.search.description,
+                        issueNumber : $scope.vm.search.issueNumber,
                         projectType : $scope.vm.search.projectType,
                         combinationIssueNumber : $scope.vm.search.combinationIssueNumber.trim(),
                         beginRegisterDate : "",
@@ -589,10 +594,14 @@
                 }
 
                 //  �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
-                function getPageList(selectedPage, detail = false) {
+                function getPageList(selectedPage, detail = false, keyWord = "") {
                     $rootScope.spinner = true;  //  �봽濡쒓렇�옒�뒪 諛�
                     if (selectedPage < 0) {
                         selectedPage = 0;
+                    }
+
+                    if (keyWord !== "") {
+                        $scope.vm.search.keyWord = keyWord;
                     }
 
                     if ($scope.vm.hideCompleteIssue) {
@@ -616,7 +625,7 @@
                     // 寃��깋 湲곕낯媛� �꽭�똿
                     $scope.vm.search.issueTypeIds = [];
                     $scope.vm.projects = [];
-                    if (!$rootScope.isMainSearch) {
+                    if ($scope.vm.searchAll.keyWord == null || $scope.vm.searchAll.keyWord === "") {
                         // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
                         if ($rootScope.issueTypeMenu != null) {
                             //$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
@@ -637,6 +646,7 @@
                                 $scope.vm.projects.push($rootScope.workProject);
                             }
                         }
+                        //$scope.vm.searchAll.keyWord = "";
                     }
 
                     //  �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
@@ -675,7 +685,6 @@
                             } else {
                                 $scope.vm.responseData = result.data;
                             }
-
                         }
                         else {
                             SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
@@ -1252,10 +1261,14 @@
                     var params = $rootScope.previousGetParams;
                     if ($rootScope.isDefined(params)) {
                         // $rootScope.$broadcast("makeIssueSearch", {  projectKey : params.projectKey, issueNumber : params.issueNumber });
-                        getDetailList(params.projectKey, params.issueNumber);
-                        $rootScope.previousGetParams = null;
+                         if (params.keyWord != null) {
+                             $scope.vm.searchAll.keyWord = params.keyWord;
+                             getPageList(0,false, params.keyWord);
+                         }else {
+                            getDetailList(params.projectKey, params.issueNumber);
+                            return;
+                        }
                         // $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
-                        return;
                     }
 
                     var promises = {

--
Gitblit v1.8.0