~jhpark/owl-kisa.git - maprexDevGit

부모: 6b700a86 | 패치 | 커밋 | ignore whitespace

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

wyu

2021-12-28 fed164fcc7b782f1d773cdfc10a3d9f44264c8cd

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

5개 파일 변경됨

	src/main/webapp/i18n/ko/global.json	1 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueAddDown.controller.js	24 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueAddRelation.controller.js	27 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/app/issue/issueDetail.controller.js	2 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리
	src/main/webapp/scripts/components/utils/autoComplete.controller.js	2 ●●●●● 패치 \| 보기 \| raw \| blame \| 히스토리

 src/main/webapp/i18n/ko/global.json

@@ -223,6 +223,7 @@
        "settingTableDisplay": "테이블 표시 설정",
        "deleteIssue": "이슈 삭제",
        "wantToDeleteSelectIssue": "선택한 이슈를 삭제하겠습니까? \n 사용자가 직접 삭제한 이슈는 어떠한 경우에도 복구가 불가능합니다.",
        "wantToDeleteSelectDownIssueInList": "선택한 하위 이슈를 하위 이슈 리스트에서 제외시키겠습니까?",
        "wantToDeleteOnlySelectIssue": "선택한 이슈만 삭제하겠습니까? \n 사용자가 직접 삭제한 이슈는 어떠한 경우에도 복구가 불가능합니다.",
        "wantToDeleteSelectDownIssue": "선택한 이슈의 하위 이슈가 존재 합니다. \n 선택한 이슈와 하위 이슈 모두 삭제하겠습니까? \n 사용자가 직접 삭제한 이슈는 어떠한 경우에도 복구가 불가능합니다.",
        "wantToDeleteSelectRelationIssue": "선택한 연관 이슈를 삭제하겠습니까? \n 사용자가 직접 삭제한 연관 이슈는 복구가 불가능합니다.",

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

@@ -39,6 +39,7 @@
                    containsPartner : containsPartner,
                    getPartners : getPartners,
                    addDownIssue : addDownIssue,
                    getDepartments : getDepartments,
                };

                $scope.vm = {
@@ -910,6 +911,26 @@

                }

                function getDepartments() {
                    if($scope.vm.form.issueTypeId === ""){
                        $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
                    }
                    var content = {
                        issueTypeId : $scope.vm.form.issueTypeId,
                    };
                    Issue.findReadyDepartments($resourceProvider.getContent(
                        content,
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {
                        if (result.data.message.status === "success") {
                            angular.forEach(result.data.data, function (department) {
                                department.byName = department.departmentName;
                                $scope.vm.form.departments.push(department);
                            });
                        }
                    });

                }

                //  최초 실행
                function startExecute() {

@@ -917,7 +938,8 @@
                        getIssueTypes : $scope.fn.getIssueTypes(),
                        getPriorities : $scope.fn.getPriorities(),
                        getSeverities : $scope.fn.getSeverities(),
                        getPartners : $scope.fn.getPartners()
                        getPartners : $scope.fn.getPartners(),
                        getDepartments : $scope.fn.getDepartments()
                    };
                    $q.all(promises).then(function (results) {
                        // 현재 프로젝트 설정

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

@@ -39,6 +39,7 @@
                    containsPartner : containsPartner,
                    getPartners : getPartners,
                    addRelationIssue : addRelationIssue,
                    getDepartments : getDepartments
                };

                $scope.vm = {
@@ -168,6 +169,8 @@

                $scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) {
                    $scope.vm.partnerVos = $scope.fn.getPartners();
                    $scope.vm.form.departments = [];
                    getDepartments(Number(newValue));
                });

                //  섬머노트 이미지 업로드
@@ -923,6 +926,27 @@

                }

                function getDepartments(issueTypeId) {
                    if($rootScope.isDefined(issueTypeId) && $scope.vm.form.issueTypeId === ""){
                        $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
                    }
                    var content = {
                        issueTypeId : $scope.vm.form.issueTypeId,
                    };
                    Issue.findReadyDepartments($resourceProvider.getContent(
                        content,
                        $resourceProvider.getPageContent(0, 1))).then(function (result) {
                        if (result.data.message.status === "success") {
                            $scope.vm.form.departments = [];
                            angular.forEach(result.data.data, function (department) {
                                department.byName = department.departmentName;
                                $scope.vm.form.departments.push(department);
                            });
                        }
                    });

                }

                //  최초 실행
                function startExecute() {

@@ -930,7 +954,8 @@
                        getIssueTypes : $scope.fn.getIssueTypes(),
                        getPriorities : $scope.fn.getPriorities(),
                        getSeverities : $scope.fn.getSeverities(),
                        getPartners : $scope.fn.getPartners()
                        getPartners : $scope.fn.getPartners(),
                        //getDepartments : $scope.fn.getDepartments()
                    };
                    $q.all(promises).then(function (results) {
                        // 현재 프로젝트 설정

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

@@ -156,7 +156,7 @@
                    //  삭제 알림
                    SweetAlert.swal({
                            title : $filter("translate")("issue.downIssueRemove"), // 하위 이슈 삭제
                            text : $filter("translate")("issue.wantToDeleteSelectIssue"),
                            text : $filter("translate")("issue.wantToDeleteSelectDownIssueInList"),
                            type : "warning",
                            showCancelButton : true,
                            confirmButtonColor : "#DD6B55",

 src/main/webapp/scripts/components/utils/autoComplete.controller.js

@@ -354,7 +354,7 @@
                function getIssueDepartmentList(issueTypeId, query, excludeList, page, callBack) {
                    var conditions = {
                        //issueTypeId : $scope.vm.form.issueTypeId,
                        issueTypeId : issueTypeId,
                        issueTypeId : Number(issueTypeId),
                        departmentName : query,
                        userId : $rootScope.user.id,
                        projectId : (function () {

			@@ -223,6 +223,7 @@
			"settingTableDisplay": "테이블 표시 설정",
			"deleteIssue": "이슈 삭제",
			"wantToDeleteSelectIssue": "선택한 이슈를 삭제하겠습니까? \n 사용자가 직접 삭제한 이슈는 어떠한 경우에도 복구가 불가능합니다.",
			"wantToDeleteSelectDownIssueInList": "선택한 하위 이슈를 하위 이슈 리스트에서 제외시키겠습니까?",
			"wantToDeleteOnlySelectIssue": "선택한 이슈만 삭제하겠습니까? \n 사용자가 직접 삭제한 이슈는 어떠한 경우에도 복구가 불가능합니다.",
			"wantToDeleteSelectDownIssue": "선택한 이슈의 하위 이슈가 존재 합니다. \n 선택한 이슈와 하위 이슈 모두 삭제하겠습니까? \n 사용자가 직접 삭제한 이슈는 어떠한 경우에도 복구가 불가능합니다.",
			"wantToDeleteSelectRelationIssue": "선택한 연관 이슈를 삭제하겠습니까? \n 사용자가 직접 삭제한 연관 이슈는 복구가 불가능합니다.",

			@@ -39,6 +39,7 @@
			containsPartner : containsPartner,
			getPartners : getPartners,
			addDownIssue : addDownIssue,
			getDepartments : getDepartments,
			};

			$scope.vm = {
			@@ -910,6 +911,26 @@

			}

			function getDepartments() {
			if($scope.vm.form.issueTypeId === ""){
			$scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
			}
			var content = {
			issueTypeId : $scope.vm.form.issueTypeId,
			};
			Issue.findReadyDepartments($resourceProvider.getContent(
			content,
			$resourceProvider.getPageContent(0, 1))).then(function (result) {
			if (result.data.message.status === "success") {
			angular.forEach(result.data.data, function (department) {
			department.byName = department.departmentName;
			$scope.vm.form.departments.push(department);
			});
			}
			});

			}

			// 최초 실행
			function startExecute() {

			@@ -917,7 +938,8 @@
			getIssueTypes : $scope.fn.getIssueTypes(),
			getPriorities : $scope.fn.getPriorities(),
			getSeverities : $scope.fn.getSeverities(),
			getPartners : $scope.fn.getPartners()
			getPartners : $scope.fn.getPartners(),
			getDepartments : $scope.fn.getDepartments()
			};
			$q.all(promises).then(function (results) {
			// 현재 프로젝트 설정

			@@ -156,7 +156,7 @@
			// 삭제 알림
			SweetAlert.swal({
			title : $filter("translate")("issue.downIssueRemove"), // 하위 이슈 삭제
			text : $filter("translate")("issue.wantToDeleteSelectIssue"),
			text : $filter("translate")("issue.wantToDeleteSelectDownIssueInList"),
			type : "warning",
			showCancelButton : true,
			confirmButtonColor : "#DD6B55",

			@@ -354,7 +354,7 @@
			function getIssueDepartmentList(issueTypeId, query, excludeList, page, callBack) {
			var conditions = {
			//issueTypeId : $scope.vm.form.issueTypeId,
			issueTypeId : issueTypeId,
			issueTypeId : Number(issueTypeId),
			departmentName : query,
			userId : $rootScope.user.id,
			projectId : (function () {