통합검색 수정

wyu

2021-12-21 4c3e2d80a26559ff44f0e4063823f173dafa1f25

통합검색 수정

 src/main/webapp/scripts/app/common/common.controller.js

@@ -36,13 +36,6 @@
                    }
                };

                //  session check after route
                $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
                    if (!$rootScope.isMainSearch) {
                        $scope.vm.searchAll.keyWord = "";
                    }
                });

                //  시스템에서 특정 이슈로 바로 이동할 수 있도록 해준다.
                $scope.$on("makeIssueSearch", function (event, args) {
                    //  이슈 번호를 저장한 후 이슈 목록으로 이동한다.
@@ -67,13 +60,14 @@

                // 메인 상단 검색
                function searchAll() {
                    $rootScope.isMainSearch = true;

                    if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
                        $state.go("issues.list");
                    if ($state.current.name !== "issues.list") {
                        // $state.go("issues.list");
                        var myUrl = window.location.href.split('#/');
                        location.href = myUrl[0] + "#/issues/issueList?keyWord=" + $scope.vm.searchAll.keyWord;
                    } else {
                        $rootScope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
                    }

                    $rootScope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
                }

                function setLastIssueType() {

 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 = {

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

@@ -47,9 +47,12 @@
                });

                // 상단 검색시
                $scope.$on("searchIssueList", function (event, args) {
                if ($rootScope.previousGetParams != null && $rootScope.previousGetParams.keyWord != null && $rootScope.previousGetParams.keyWord !== "") {
                    $scope.vm.pageTitle = $filter("translate")("issue.searchIssue");
                });
                }
                /*$scope.$on("searchIssueList", function (event, args) {
                    $scope.vm.pageTitle = $filter("translate")("issue.searchIssue");
                });*/

                function start() {
                    if ($rootScope.issueTypeMenu != null) {

 src/main/webapp/scripts/config.js

@@ -73,9 +73,6 @@
                //  최고관리자 존재 여부
                $rootScope.hasSuperUser = false;

                //  메인 검색 여부
                $rootScope.isMainSearch = false;

                // 대시보드 선택 0:전체 1:프로젝트
                $rootScope.dashboard = 0;

@@ -570,10 +567,6 @@
                        }
                    }

                    // 이슈 검색 페이지에서 벗어날 경우 처리
                    if ($rootScope.isMainSearch) {
                        $rootScope.isMainSearch = false;
                    }
                });

                //  if ui-router $http occur error, trigger this event