Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

wyu

2021-12-28 a75bcc7c2b0fc98bd3a8abc100a4ad4ec11b9c26

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

@@ -23,21 +23,23 @@
                    moveMenu : moveMenu,
                    findIssueList : findIssueList,   // 사이드바 이슈 목록 가져오기
                    changeIssueListMenu : changeIssueListMenu,
                    setLastIssueType : setLastIssueType
                    setLastIssueType : setLastIssueType,
                    searchAll : searchAll       // 상단 검색
                };

                $scope.vm = {
                    workProject : -1,
                    message: "",
                    workProjectId : -1
                    workProjectId : -1,
                    searchAll : {
                        keyWord : ""
                    }
                };



                //  시스템에서 특정 이슈로 바로 이동할 수 있도록 해준다.
                $scope.$on("makeIssueSearch", function (event, args) {
                    //  이슈 번호를 저장한 후 이슈 목록으로 이동한다.
                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber, args.issueTypeId);
                });

                // 이슈 유형 변경시
@@ -51,10 +53,28 @@
                });

                $scope.$on("changedLastProject", function () {
                    if ($rootScope.workProject != null) {
                    //if ($rootScope.workProject != null) {
                        $scope.fn.findIssueList($rootScope.workProject.id);
                    //}
                });

                $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
                    var keyWord = $rootScope.getCookie("searchKeyword");

                    if (keyWord == null || keyWord === '') {
                        $scope.vm.searchAll.keyWord = "";
                    }
                });

                // 메인 상단 검색
                function searchAll() {
                    if ($rootScope.isDefined($scope.vm.searchAll.keyWord)) {
                        $rootScope.setCookie("searchKeyword", $scope.vm.searchAll.keyWord, 60000);
                        moveMenu("issues.list");
                    } else {
                        SweetAlert.warning($filter("translate")("common.alertSystem"), $filter("translate")("issue.pleaseEnterIssueKeyWord"));
                    }
                }

                function setLastIssueType() {
                    if (User != null) {
@@ -80,6 +100,8 @@

                    // sidebar 클릭시 프로젝트 아이디 설정
                    if (changeProject) {

                        $rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
                        $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);

                        if ($rootScope.issueTypeMenu != null) {
@@ -87,12 +109,10 @@
                        }
                    }
                    //moveMenu("issues.list");
                    //$rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);

                    if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
                        $scope.fn.setLastIssueType(issueTypeId);
                    }

                }

                function moveMenu(stateName) {
@@ -116,7 +136,7 @@
                }

                //  이슈 번호를 저장한 후 이슈 목록으로 이동한다.
                function makeIssueSearch(projectKey, issueNumber) {
                function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
                    var combinationIssueNumber = projectKey;
                    if (issueNumber != undefined) {
                        combinationIssueNumber += "-" + issueNumber;
@@ -134,6 +154,7 @@
                        $resourceProvider.getPageContent(0, 0))).then(function (result) {

                        if (result.data.message.status === "success") {
                            $scope.fn.changeIssueListMenu(issueTypeId);
                            moveMenu("issues.list");
                        } else {
                            SweetAlert.error($filter("translate")("issue.failedToSaveFieldConditions"), result.data.message.message); // "검색 필드 조건 저장 실패"
@@ -184,9 +205,9 @@
                                    }

                                    var id = $rootScope.workProject.id === -1 ? null : $rootScope.workProject.id;
                                    $scope.fn.findIssueList(id);
                                }
                                $rootScope.projects = datas;
                                $scope.fn.findIssueList(id);
                            }

                            if ($rootScope.user.lastProjectId == null) {
@@ -241,6 +262,10 @@

                // 이슈 유형 목록 가져오기
               function findIssueList(projectId) {

                    if ($rootScope.projects == null || $rootScope.projects.length <= 1)
                        return;

                   //  이슈 타입 목록 검색 조건을 만든다.
                   var conditions = {
                       projectId : projectId > -1 ? projectId : null,
@@ -256,23 +281,15 @@
                           if ($rootScope.workIssueTypes != null && $rootScope.workIssueTypes.length > 0) {
                               $rootScope.workIssueTypes.forEach(function (issueType) {

                                   var selectIssueTypeId = null;
                                   //var selectIssueTypeId = null;
                                   if (issueType.id === $rootScope.user.lastIssueTypeId) {
                                       selectIssueTypeId = issueType.id;
                                       //selectIssueTypeId = issueType.id;
                                       $scope.fn.changeIssueListMenu(issueType.id, false);
                                       $state.go('dashboards.dashboard');
                                   }

                                   if (selectIssueTypeId == null) {
                                       $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id, false);

                                       // 이슈목록 새로고침 목록 갱신
                                       $scope.$broadcast("findIssueListOK", { myIssueType : issueType} );
                                   }
                               });
                           }
                           // 대쉬보드로 가는데 프로젝트를 생성하거나 수정해도 걸리는 조건이다.
                           // else {
                           //     $state.go('dashboards.dashboard');
                           // }
                       }
                       else {
                           SweetAlert.error($filter("translate")("managementType.failedToIssueTypeList"), result.data.message.message); // "이슈 유형 목록 조회 실패"