Merge remote-tracking branch 'origin/master'

박지현

2022-02-22 1dad4d94cc415d2f8092aff0368744289337f504

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

@@ -845,8 +845,6 @@
                        if (result.data.message.status === "success") {
                            $scope.fn.addDownIssue(result.data.data);

                            $scope.fn.cancel();

                            //  이슈 상세 화면 요청
                            $rootScope.$broadcast("getIssueDetail", {
                                id : parameter.id
@@ -861,40 +859,84 @@
                    });
                }

                // 연관 이슈 추가
                function addDownIssue(downId) {
                    /*if ($scope.vm.issueName.length == 0 || $scope.vm.form.issues.length == 0
                        || $scope.vm.issueName != $scope.vm.form.issues[0].title) {
                        SweetAlert.error($filter("translate")("issue.errorSelectRelationIssue"), "");
                        return;
                    }*/
                // 하위 이슈 추가
                function addDownIssue(issueVo) {
                    $rootScope.spinner = true;
                    let inheritYn = issueVo.inheritPartners;
                    let usePartner = issueVo.usePartner;

                    var ids = [];
                    if (downId != null) {
                        ids.push(downId);
                    if (issueVo.id != null) {
                        ids.push(issueVo.id);
                    }

                    var contents = {
                        //relationIssueType : $scope.vm.form.relationIssueTypeId,
                        // issueId : $rootScope.currentDetailIssueId,
                        issueId :  parameter.id,
                        ids : ids,
                        parentIssueId : parameter.id
                    };
                    if ($rootScope.isDefined(usePartner) && usePartner > 0
                            && $rootScope.isDefined(inheritYn) && inheritYn) {
                        SweetAlert.swal({
                            title : $filter("translate")("issue.addDownIssue"), // 하위 이슈 추가
                            text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // 상위이슈의 파트너 정보(업체/ISP/호스팅)를 적용시키겠습니까?
                            type : "warning",
                            showCancelButton : true,
                            confirmButtonColor : "#DD6B55",
                            confirmButtonText : $filter("translate")("common.ok"), // 네
                            cancelButtonText : $filter("translate")("common.no"), // 아니오
                            closeOnConfirm : false,
                            closeOnCancel : false
                        },
                        function (isConfirm) {
                            if (!isConfirm) {
                                inheritYn = false;
                            }

                    Issue.modifyParentIssue($resourceProvider.getContent(
                        contents,
                        $resourceProvider.getPageContent(0, 10))).then(function (result) {
                            var contents = {
                                issueId :  parameter.id,
                                ids : ids,
                                parentIssueId : parameter.id,
                                inheritYn : inheritYn
                            };

                        if (result.data.message.status === "success") {
                            //  이슈 상세 화면 요청
                            $rootScope.$broadcast("getIssueDetail", {
                                id : parameter.id
                            Issue.modifyParentIssue($resourceProvider.getContent(
                                contents,
                                $resourceProvider.getPageContent(0, 10))).then(function (result) {

                                if (result.data.message.status === "success") {
                                    $scope.fn.cancel();
                                    //  이슈 상세 화면 요청
                                    $rootScope.$broadcast("getIssueDetail", {
                                        id : parameter.id
                                    });
                                }
                                else {
                                    SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "하위이슈 생성 실패"
                                }
                                $rootScope.spinner = false;
                            });
                        }
                        else {
                            SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "연관일감 생성 실패"
                        }
                    });
                        });
                    } else {

                        var contents = {
                            issueId :  parameter.id,
                            ids : ids,
                            parentIssueId : parameter.id,
                            inheritYn : inheritYn
                        };

                        Issue.modifyParentIssue($resourceProvider.getContent(
                            contents,
                            $resourceProvider.getPageContent(0, 10))).then(function (result) {

                            if (result.data.message.status === "success") {
                                $scope.fn.cancel();
                                //  이슈 상세 화면 요청
                                $rootScope.$broadcast("getIssueDetail", {
                                    id : parameter.id
                                });
                            }
                            else {
                                SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "하위이슈 생성 실패"
                            }
                        });
                    }
                }

                //  팝업 창 닫기
@@ -1117,6 +1159,9 @@
                            $scope.vm.projectName = $rootScope.workProject.name;
                            $scope.vm.form.projects = [];
                            $scope.vm.form.projects.push($rootScope.workProject);
                        } else {
                            $scope.vm.projectName = parameter.project.name;
                            $scope.vm.form.projects.push(parameter.project);
                        }
                        // 현재 이슈타입 유형 설정
                        var id = $rootScope.getCurrentIssueTypeId();
@@ -1125,6 +1170,8 @@
                        } else {
                            $scope.vm.form.issueTypeId = parameter.issueTypeId.toString();
                        }
                        // 이슈유형, 프로젝트 set 한 후에 사용자정의필드 set
                        $scope.fn.getIssueTypeCustomFields();
                        $log.debug("promises 결과 ", results);
                    });
                }