From 9ff3e8c43d01f758381b4925cff44502f1241750 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 14:26:36 +0900
Subject: [PATCH] - 일반 사용자로 검색 기능 제대로 동작안되는 문제 해결 - 이슈 유형에서 사용중인 프로젝트는 삭제 불가 - 이슈 유형에서 프로젝트 검색 시 워크스페이스 관리자는 모든 프로젝트 검색 가능(기존엔 참여하고있는 프로젝트만 검색가능하게되어있었음)
---
src/main/java/kr/wisestone/owl/vo/UserLevelVo.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
index 3787a88..3bc95c3 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
@@ -16,12 +16,11 @@
private String defaultYn;
private String basicUser;
- private Boolean permAllIssueSetting;
- private Boolean permAllProjectSetting;
public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
+ public Boolean permIssueSystemSetting;
public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
@@ -158,29 +157,28 @@
this.permGuide = permGuide;
}
- public Boolean getPermAllIssueSetting() {
- return permAllIssueSetting;
+ public Boolean getPermPartnerSetting() {
+ return permPartnerSetting;
}
- public void setPermAllIssueSetting(Boolean permAllIssueSetting) {
- this.permAllIssueSetting = permAllIssueSetting;
+ public Boolean getPermIssueSystemSetting() {
+ return permIssueSystemSetting;
}
- public Boolean getPermAllProjectSetting() {
- return permAllProjectSetting;
+ public void setPermIssueSystemSetting(Boolean permIssueSystemSetting) {
+ this.permIssueSystemSetting = permIssueSystemSetting;
}
- public void setPermAllProjectSetting(Boolean permAllProjectSetting) {
- this.permAllProjectSetting = permAllProjectSetting;
+ public void setPermPartnerSetting(Boolean permPartnerSetting) {
+ this.permPartnerSetting = permPartnerSetting;
}
public void toPermissionValues() {
- this.permAllIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_ALL);
- this.permAllProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT_ALL);
+ this.permProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT);
+ this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE);
+ this.permIssueSystemSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
this.permPartnerSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PARTNER);
this.permWorkSpaceSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_WORKSPACE);
- this.permProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT);
- this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
this.permApi = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_API);
this.permNotice = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_NOTICE);
this.permFAQ = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_FAQ);
--
Gitblit v1.8.0