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

wyu

2021-12-09 107ab8e67d089738ad8b3a1ff0efc96680a13cf6

 src/main/webapp/scripts/app/api/apiSetting.controller.js

@@ -140,7 +140,7 @@
                    });
                }

                $scope.$watch("vm.issueTypeId", function (newValue){
                $scope.$watch("vm.issueTypeId", function (newValue, oldValue){
                    if (newValue != null && newValue !== "") {
                        $scope.fn.loadPage();
                    }
@@ -189,7 +189,6 @@
                }

                function onChangeIssueTypeOverlap() {
                    $scope.fn.getIssueStatuses();
                    $scope.fn.getIssueTypeCustomFields();
                    $scope.fn.getOverlapList();
                }
@@ -237,8 +236,6 @@
                            if (result.data.message.status === "success") {
                                SweetAlert.swal($filter("translate")("api.successToApiAutoCompleteIssueStatus"), result.data.message.message, "success"); // "설정 성공"
                                $scope.fn.getIssueTypes();
                                $scope.fn.getIssueStatuses();
                                $scope.fn.getIssueTypeCustomFields();
                            } else {
                                SweetAlert.swal($filter("translate")("api.failedToApiAutoCompleteIssueStatus"), result.data.message.message, "error"); // "설정 실패"
                            }
@@ -403,6 +400,7 @@
                    if (tab === "API_COL_SETTING") {
                        $scope.fn.onChangeColumnSetting();
                    } else if (tab === "API_OVERLAP_SETTING") {
                        $scope.fn.getIssueStatuses();
                        $scope.fn.onChangeIssueTypeOverlap();
                    } else if (tab === "API_SPEC_SETTING") {
                        $scope.fn.onChangeIssueTypeSpec();
@@ -410,44 +408,48 @@
                }

                $scope.$on("getIssueStatusComplete", function (event, args){
                    if ($scope.vm.issueStatuses != null) {
                        $scope.vm.completeIssueStatuses = [];
                    if ($scope.vm.tab === "API_OVERLAP_SETTING") {
                        if ($scope.vm.issueStatuses != null) {
                            $scope.vm.completeIssueStatuses = [];

                        $scope.vm.issueStatuses.forEach(function (issueStatus) {
                            if (issueStatus.issueStatusType === "CLOSE") {
                                $scope.vm.completeIssueStatuses.push(issueStatus);
                            }
                        });

                        // 설정된 상태 지정
                        $scope.vm.completeIssueStatusId = "";
                        let issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
                        if (issueTypeVo.completeIssueStatusVo != null) {
                            $scope.vm.completeIssueStatuses.forEach(function (issueStatus) {
                                if (issueStatus.id === issueTypeVo.completeIssueStatusVo.id) {
                                    $scope.vm.completeIssueStatusId = issueStatus.id.toString();
                            $scope.vm.issueStatuses.forEach(function (issueStatus) {
                                if (issueStatus.issueStatusType === "CLOSE") {
                                    $scope.vm.completeIssueStatuses.push(issueStatus);
                                }
                            });

                            // 설정된 상태 지정
                            $scope.vm.completeIssueStatusId = "";
                            let issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
                            if (issueTypeVo.completeIssueStatusVo != null) {
                                $scope.vm.completeIssueStatuses.forEach(function (issueStatus) {
                                    if (issueStatus.id === issueTypeVo.completeIssueStatusVo.id) {
                                        $scope.vm.completeIssueStatusId = issueStatus.id.toString();
                                    }
                                });
                            }
                        }
                    }
                });

                function getIssueStatuses() {
                    var condition = {
                        issueTypeId : $scope.vm.issueTypeId
                        issueTypeId: $scope.vm.issueTypeId
                    }
                    IssueStatus.findIssueStatusesByIssueType($resourceProvider.getContent(condition,
                        $resourceProvider.getPageContent(0, 1000))).then(function (result) {

                        if (result.data.message.status === "success") {
                            $scope.vm.issueStatuses = result.data.data;
                            $scope.vm.issueStatusId = "";
                            if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) {
                                $scope.vm.issueStatusId = $scope.vm.issueStatuses[0].id.toString();

                            // $scope.vm.issueStatusId = "";
                            if ($scope.vm.issueTypeId === "") {
                                if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) {
                                    $scope.vm.issueStatusId = $scope.vm.issueStatuses[0].id.toString();
                                }
                            }
                            $scope.$broadcast("getIssueStatusComplete", $scope.vm.issueStatuses);
                        }
                        else {
                        } else {
                            SweetAlert.swal($filter("translate")("issue.failedToCriticalListLookup"), result.data.message.message, "error"); // 중요도 목록 조회 실패
                        }
                    });
@@ -461,6 +463,7 @@


                function onChangeIssueTypeSpec() {
                    $scope.fn.getIssueStatuses();
                    $scope.fn.getIssueTypeCustomFields();
                }

@@ -496,7 +499,6 @@

                    var jsonData = {
                        token: "||발급받은 토큰||",
                        title: "||이슈 제목||",
                        issueTypeId: $scope.vm.issueTypeId,
                        apiType: "modify",
                        issueStatusId: $scope.vm.issueStatusId,