From d8b90cea2b95f8aedd7a213e71908b44c1df6728 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 월, 29 11월 2021 14:37:02 +0900 Subject: [PATCH] - api 기본값 설정 기능 완료 - api 중복 필드 설정 기능 완료 --- src/main/webapp/scripts/app/issue/issueDetail.controller.js | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 40 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js index 0e69b70..d2837a2 100644 --- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js +++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js @@ -41,6 +41,7 @@ $scope.fn.addDownIssueTableConfig = addDownIssueTableConfig; // �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 $scope.fn.getRelTableConfigs = getRelTableConfigs; $scope.fn.getDownTableConfigs = getDownTableConfigs; + $scope.fn.containsPartner = containsPartner; // �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以� $scope.vm.viewer = {}; @@ -462,7 +463,8 @@ // �뿰愿� �씠�뒋 �긽�꽭 議고쉶 function getRelTableConfigs() { var content = { - issueId : $scope.vm.viewer.id + issueId : $scope.vm.viewer.id, + issueTypeId : $rootScope.getCurrentIssueTypeId() }; IssueTableConfig.relationDetail($resourceProvider.getContent( @@ -526,7 +528,8 @@ // �븯�쐞 �씠�뒋 �긽�꽭 議고쉶 function getDownTableConfigs() { var content = { - issueId : $scope.vm.viewer.id + issueId : $scope.vm.viewer.id, + issueTypeId : $rootScope.getCurrentIssueTypeId() }; IssueTableConfig.downDetail($resourceProvider.getContent( @@ -653,9 +656,9 @@ $scope.vm.editor.issueStatus = false; $scope.vm.issueForm.issueStatusList = []; $scope.vm.issueForm.issueStatusId = ""; - if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') { + /*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') { $scope.$apply(); - } + }*/ } // �씠�뒋 �긽�깭 蹂�寃� @@ -668,7 +671,8 @@ resolve : { parameter : function () { return { - issueIds : [$scope.vm.viewer.id] + issueIds : [$scope.vm.viewer.id], + projectId : $scope.vm.viewer.projectVo.id }; } } @@ -722,7 +726,14 @@ size : "lg", controller : 'issueAddRelationTableConfigController', backdrop : 'static', - resolve : {} + resolve : { + parameter : function () { + return { + issueTypeId : $scope.vm.viewer.issueTypeVo.id + + }; + } + } }); } @@ -733,7 +744,14 @@ size : "lg", controller : 'issueAddDownTableConfigController', backdrop : 'static', - resolve : {} + resolve : { + parameter : function () { + return { + issueTypeId : $scope.vm.viewer.issueTypeVo.id + }; + + } + } }); } @@ -763,6 +781,21 @@ SweetAlert.swal($filter("translate")("issue.errorRemovableIssueStatusList"), result.data.message.message, "error"); // "�씠�룞 媛��뒫�븳 �씠�뒋 �긽�깭 紐⑸줉 議고쉶 �삤瑜�" } }); + } + + // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤 + function containsPartner(name) { + var result = false; + + if ($scope.vm.viewer.usePartnerVos != null) { + $scope.vm.viewer.usePartnerVos.forEach(function (partnerVo) { + if (name === partnerVo.name) { + result = true; + } + }); + } + return result; + } // �씠�뒋 �긽�꽭 �젙蹂� 議고쉶 @@ -1050,7 +1083,6 @@ } }); } - } ]); } -- Gitblit v1.8.0