From 8cdee12102d831355c2be8fedff2d7f26cb0931b Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 목, 16 12월 2021 19:02:28 +0900 Subject: [PATCH] - 프로젝트내 이슈유형에 설정된 사용자 정의 필드가 없을 경우 오류 예외 처리(api 입력 안되는 원인이었음) --- src/main/webapp/scripts/app/issue/issueDetail.controller.js | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js index 647750a..ad81f3a 100644 --- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js +++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js @@ -81,6 +81,7 @@ $scope.vm.form = { issues : [], //�뿰愿� �씪媛� issuesDown : [], // �븯�쐞 �씪媛� + issuesDownStatus : [], //�븯�쐞 �씠�뒋 �긽�깭 issueCompanyVos : [], issueIspVos : [], issueHostingVos : [] @@ -477,14 +478,16 @@ .setHWidth("width-60-p bold") .setHSort(false) .setDRenderer("ISSUE_DOWN_MOVE")) - $scope.vm.downTableConfigs.push($tableProvider.config() - .setHName("issue.relationIssueDelete") - .setDType("renderer") - .setDAlign("text-center") - .setHWidth("width-20-p bold") - .setDRenderer("ISSUE_DOWN_DELETE") - .setHSort(false) - .setDAlign("text-center")) + if($scope.vm.viewer.modifyPermissionCheck){ + $scope.vm.downTableConfigs.push($tableProvider.config() + .setHName("issue.relationIssueDelete") + .setDType("renderer") + .setDAlign("text-center") + .setHWidth("width-20-p bold") + .setDRenderer("ISSUE_DOWN_DELETE") + .setHSort(false) + .setDAlign("text-center")) + } angular.forEach($scope.vm.downTableConfigs, function (Down_issueTableConfig) { // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎. @@ -497,7 +500,10 @@ // �뿰愿� �씠�뒋 �뀒�씠釉� �꽕�젙 function setRelTableConfigs(issueTableConfigVo) { - if (issueTableConfigVo == null) makeRelTableConfigs(); return; + if (issueTableConfigVo == null) { + makeRelTableConfigs(); + return; + } var issueTableConfigs = issueTableConfigVo.issueTableConfigs; // �뿰愿� �뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎. @@ -695,7 +701,8 @@ parameter : function () { return { issueIds : [$scope.vm.viewer.id], - projectId : $scope.vm.viewer.projectVo.id + projectId : $scope.vm.viewer.projectVo.id, + downIssuesStatus : $scope.vm.form.issuesDownStatus }; } } @@ -876,6 +883,7 @@ $scope.vm.form.issues = []; $scope.vm.form.issues.push(result.data.data); $scope.vm.form.issuesDown = []; + $scope.vm.form.issuesDownStatus = [];// �븯�쐞�씠�뒋 �긽�깭 $scope.vm.form.issuesDown.push(result.data.data); var issueTableConfigVos = result.data.data.issueTableConfigVos; @@ -895,7 +903,7 @@ angular.forEach(result.data.data.issueDownVos, function (issueDownVo){ //$scope.vm.form.issuesDown.push(issueDownVo.issueDown); $scope.vm.form.issuesDown.push(issueDownVo); - + $scope.vm.form.issuesDownStatus.push(issueDownVo.issueStatusVo.issueStatusType); }); } $scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos; @@ -904,6 +912,7 @@ if ($rootScope.workProject.id > -1 && result.data.data.projectVo !== null) { $rootScope.changeLastProject(result.data.data.projectVo.id); } + } } else { -- Gitblit v1.8.0