통합검색 수정

wyu

2021-12-21 4c3e2d80a26559ff44f0e4063823f173dafa1f25

 src/main/webapp/scripts/app/issue/issueList.controller.js

@@ -591,10 +591,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) {
@@ -618,7 +622,7 @@
                    // 검색 기본값 세팅
                    $scope.vm.search.issueTypeIds = [];
                    $scope.vm.projects = [];
                    if (!$rootScope.isMainSearch) {
                    if ($scope.vm.search.keyWord == null || $scope.vm.search.keyWord === "") {
                        // 메뉴에서 선택된 이슈 유형을 기본으로 추가
                        if ($rootScope.issueTypeMenu != null) {
                            //$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
@@ -627,18 +631,19 @@
                                fieldKey: $rootScope.issueTypeMenu.id,
                                fieldValue: $rootScope.issueTypeMenu.name
                            });
                        }

                        //  검색 조건을 저장한다.
                        //$scope.fn.makeVmSearchObject();
                            //  검색 조건을 저장한다.
                            //$scope.fn.makeVmSearchObject();

                        // 현재 선택된 프로젝트를 검색 기본으로 추가
                        if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
                            var find = findProjectSearch($rootScope.workProject.id);
                            if (!find) {
                                $scope.vm.projects.push($rootScope.workProject);
                            // 현재 선택된 프로젝트를 검색 기본으로 추가
                            if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
                                var find = findProjectSearch($rootScope.workProject.id);
                                if (!find) {
                                    $scope.vm.projects.push($rootScope.workProject);
                                }
                            }
                        }

                    }

                    //  이슈 검색 조건을 만든다.
@@ -1254,14 +1259,14 @@
                    var params = $rootScope.previousGetParams;
                    if ($rootScope.isDefined(params)) {
                        // $rootScope.$broadcast("makeIssueSearch", {  projectKey : params.projectKey, issueNumber : params.issueNumber });
                        // if (params.keyWord != null) {
                        //     getIssueList(params.keyWord);
                        // }else {
                         if (params.keyWord != null) {
                             getPageList(0,false,params.keyWord);
                         }else {
                            getDetailList(params.projectKey, params.issueNumber);
                        //}
                            return;
                        }
                        $rootScope.previousGetParams = null;
                        // $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
                        return;
                    }

                    var promises = {