From 3571222dcf5f25b458b822fe888d695622144016 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 28 12월 2021 21:44:36 +0900 Subject: [PATCH] - 연관이슈, 하위이슈 추가 시 이슈타입 별 담당부서 불러오기 - 이슈 상세페이지에서 하위이슈 리스트에서 제거 시 팝업 문구 수정 --- src/main/webapp/scripts/app/issue/issueDetail.controller.js | 77 +++++++++++++++----------------------- 1 files changed, 31 insertions(+), 46 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js index 3423551..86bf9c1 100644 --- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js +++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js @@ -151,7 +151,7 @@ // �궘�젣 �븣由� SweetAlert.swal({ title : $filter("translate")("issue.downIssueRemove"), // �븯�쐞 �씠�뒋 �궘�젣 - text : $filter("translate")("issue.wantToDeleteSelectIssue"), + text : $filter("translate")("issue.wantToDeleteSelectDownIssueInList"), type : "warning", showCancelButton : true, confirmButtonColor : "#DD6B55", @@ -247,7 +247,6 @@ case "RELATION_ISSUE_TYPE" : // �뿰愿� �씠�뒋 援щ텇 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueType") - .setDName("relationIssueType") .setDType("renderer") .setDAlign("text-center") .setHWidth("bold " + Rel_issueTableConfig.width) @@ -258,7 +257,6 @@ case "RELATION_ISSUE_TITLE" : // �뿰愿� �씠�뒋 �젣紐� $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("issue.relationIssueTitle") - .setDName("relationIssueTitle") .setDType("renderer") .setDAlign("text-center") .setHWidth("bold " + Rel_issueTableConfig.width) @@ -269,7 +267,6 @@ case "RELATION_PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.priority") - .setDName("relPriority") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") @@ -278,7 +275,6 @@ case "RELATION_SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.importance") - .setDName("relSeverity") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") @@ -287,7 +283,6 @@ case "RELATION_ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.assigneeTeam") - .setDName("relAssigneeTeam") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") @@ -297,7 +292,6 @@ case "RELATION_REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.register") - .setDName("relRegister") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") @@ -306,7 +300,6 @@ case "RELATION_PERIOD" : // �뿰愿� �씠�뒋 湲곌컙 $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.period") - .setDName("relPeriod") .setDType("renderer") .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") @@ -316,8 +309,7 @@ $scope.vm.relTableConfigs.push($tableProvider.config() .setHName("common.lastChangeDate") .setHWidth("bold " + Rel_issueTableConfig.width) - .setDAlign("text-center") - .setDName("relModifyDate")); + .setDAlign("text-center")); break; } @@ -331,7 +323,6 @@ $scope.vm.relTableConfigs.push($tableProvider.config() .setHName(customField.name) .setDType("renderer") - .setDName("relCustomFieldName" + [count]) .setHWidth("bold " + Rel_issueTableConfig.width) .setDAlign("text-center") .setColumnHint(customField) @@ -352,7 +343,6 @@ case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐� $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("issue.downIssueTitle") - .setDName("downIssueTitle") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") @@ -362,7 +352,6 @@ case "ISSUE_DOWN_STATUS_TYPE" : // �씠�뒋 �긽�깭 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("issue.issueStatus") - .setDName("downIssueStatus") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") @@ -372,7 +361,6 @@ case "DOWN_PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.priority") - .setDName("downPriority") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") @@ -381,7 +369,6 @@ case "DOWN_SEVERITY" : // 以묒슂�룄 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.importance") - .setDName("downSeverity") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") @@ -390,7 +377,6 @@ case "DOWN_ASSIGNEE_TEAM" : // �떞�떦遺��꽌 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.assigneeTeam") - .setDName("downAssigneeTeam") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") @@ -399,7 +385,6 @@ case "DOWN_REGISTER" : // �벑濡앹옄 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.register") - .setDName("downRegister") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") @@ -408,7 +393,6 @@ case "DOWN_PERIOD" : // 湲곌컙 $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.period") - .setDName("downPeriod") .setDType("renderer") .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") @@ -418,8 +402,7 @@ $scope.vm.downTableConfigs.push($tableProvider.config() .setHName("common.lastChangeDate") .setHWidth("bold " + Down_issueTableConfig.width) - .setDAlign("text-center") - .setDName("downModifyDate")); + .setDAlign("text-center")); break; } @@ -433,7 +416,6 @@ $scope.vm.downTableConfigs.push($tableProvider.config() .setHName(customField.name) .setDType("renderer") - .setDName("downCustomFieldName" + [count]) .setHWidth("bold " + Down_issueTableConfig.width) .setDAlign("text-center") .setColumnHint(customField) @@ -462,15 +444,16 @@ .setHWidth("width-60-p bold") .setHSort(false) .setDRenderer("ISSUE_RELATION_MOVE")) - $scope.vm.relTableConfigs.push($tableProvider.config() - .setHName("issue.relationIssueDelete") - .setDType("renderer") - .setDAlign("text-center") - .setHWidth("width-40-p bold") - .setDRenderer("ISSUE_RELATION_DELETE") - .setHSort(false) - .setDAlign("text-center")) - + if($scope.vm.viewer.modifyPermissionCheck) { + $scope.vm.relTableConfigs.push($tableProvider.config() + .setHName("issue.relationIssueDelete") + .setDType("renderer") + .setDAlign("text-center") + .setHWidth("width-40-p bold") + .setDRenderer("ISSUE_RELATION_DELETE") + .setHSort(false) + .setDAlign("text-center")) + } angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) { // �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎. if (Rel_issueTableConfig.display) { @@ -551,14 +534,15 @@ } }); - $scope.vm.relTableConfigs.push($tableProvider.config() - .setHName("issue.relationIssueDelete") - .setDType("renderer") - .setHWidth("width-40-p bold") - .setDRenderer("ISSUE_RELATION_DELETE") - .setHSort(false) - .setDAlign("text-center")) - + if($scope.vm.viewer.modifyPermissionCheck) { + $scope.vm.relTableConfigs.push($tableProvider.config() + .setHName("issue.relationIssueDelete") + .setDType("renderer") + .setHWidth("width-40-p bold") + .setDRenderer("ISSUE_RELATION_DELETE") + .setHSort(false) + .setDAlign("text-center")) + } } else { makeRelTableConfigs(); } @@ -593,14 +577,15 @@ $scope.fn.setDownTableColumn(Down_issueTableConfig); } }); - $scope.vm.downTableConfigs.push($tableProvider.config() - .setHName("issue.relationIssueDelete") - .setDType("renderer") - .setHWidth("width-40-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") + .setHWidth("width-40-p bold") + .setDRenderer("ISSUE_DOWN_DELETE") + .setHSort(false) + .setDAlign("text-center")) + } } else { makeDownTableConfigs(); } -- Gitblit v1.8.0