From 8bc9d4b21b179710a4a959d5b3472e17fc9aded7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 11:37:55 +0900
Subject: [PATCH] 하위이슈 권한 없는데 삭제 버튼 생기는 문제 해결
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 4 ++++
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 8 ++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index d909d9e..25aaee7 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -1536,6 +1536,8 @@
this.setIssueHistory(downIssue, downIssueVo); // �씠�뒋 湲곕줉 �젙蹂� �뀑�똿
this.setIssueComments(downIssue, downIssueVo); // �뙎湲� �젙蹂� �뀑�똿
+ downIssueVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());
+
resultList.add(downIssueVo);
}
issueVo.setIssueDownVos(resultList);
@@ -1639,6 +1641,8 @@
issueStatusVo.setIssueStatusType(relationIssue.getIssueStatus().getIssueStatusType().toString());
issueRelationVo.setIssueStatusVo(issueStatusVo);
+ issueRelationVo.setModifyPermissionCheck(issueVo.getModifyPermissionCheck());
+
this.setRegister(relationIssue, relIssueVo); // �벑濡앹옄
this.setIssueDepartment(relationIssue, relIssueVo); // �떞�떦遺��꽌 �젙蹂� �뀑�똿
this.setIssueCustomFields(relationIssue, relIssueVo); // �궗�슜�옄�젙�쓽�븘�뱶 �젙蹂� �꽭�똿
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 6abb30e..d881a4f 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -246,7 +246,9 @@
// �뿰愿��씠�뒋 �궘�젣
case "ISSUE_RELATION_DELETE":
- makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
+ if (scope.data.modifyPermissionCheck) {
+ makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeRelationIssue(data.id)">';
+ }
break;
// �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
@@ -317,7 +319,9 @@
// �븯�쐞 �씠�뒋 �궘�젣
case "ISSUE_DOWN_DELETE":
- makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeDownIssue(data.id)">';
+ if (scope.data.modifyPermissionCheck) {
+ makeTag += '<img class="cursor" src="/assets/images/delete-icon.png" ng-click="event.removeDownIssue(data.id)">';
+ }
break;
// �븯�쐞 �씠�뒋 �슦�꽑 �닚�쐞
--
Gitblit v1.8.0