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

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



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

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

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

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

                    if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
                        $state.go("issues.list");
                    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"));
                    }

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

                function setLastIssueType() {
@@ -108,8 +113,6 @@
                    if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
                        $scope.fn.setLastIssueType(issueTypeId);
                    }


                }

                function moveMenu(stateName) {
@@ -278,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); // "이슈 유형 목록 조회 실패"