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

이민희

2021-12-21 13df3419f367b1448a844120840459a17df02f3a

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

@@ -36,7 +36,12 @@
                    }
                };


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

                //  시스템에서 특정 이슈로 바로 이동할 수 있도록 해준다.
                $scope.$on("makeIssueSearch", function (event, args) {
@@ -108,8 +113,6 @@
                    if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
                        $scope.fn.setLastIssueType(issueTypeId);
                    }


                }

                function moveMenu(stateName) {
@@ -202,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) {
@@ -259,6 +262,10 @@

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

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

                   //  이슈 타입 목록 검색 조건을 만든다.
                   var conditions = {
                       projectId : projectId > -1 ? projectId : null,
@@ -274,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); // "이슈 유형 목록 조회 실패"