From 799d8178d5bf8256c2334d2ff95a24f326a68534 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 19:23:42 +0900
Subject: [PATCH] - 이슈 수정시 사용자가 담당부서에 속해있으면 수정 가능 - 프로젝트 관리 권한이 있는데 프로젝트 수정 항목이 표시 안되는 문제 수정
---
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
index b8e4dce..054ef41 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -2,8 +2,6 @@
import com.google.common.collect.Lists;
import kr.wisestone.owl.constant.MngPermission;
-import kr.wisestone.owl.domain.User;
-import kr.wisestone.owl.domain.UserLevel;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.util.MapUtil;
@@ -21,6 +19,8 @@
private String basicUser;
private List<Long> removeIds = Lists.newArrayList();
+ public Boolean permAllIssueAndProjectSetting;
+ public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
@@ -93,12 +93,28 @@
this.removeIds = removeIds;
}
+ public Boolean getPermPartnerSetting() {
+ return permPartnerSetting;
+ }
+
+ public void setPermPartnerSetting(Boolean permPartnerSetting) {
+ this.permPartnerSetting = permPartnerSetting;
+ }
+
public Boolean getPermWorkSpaceSetting() {
return permWorkSpaceSetting;
}
public void setPermWorkSpaceSetting(Boolean permWorkSpaceSetting) {
this.permWorkSpaceSetting = permWorkSpaceSetting;
+ }
+
+ public Boolean getPermAllIssueAndProjectSetting() {
+ return permAllIssueAndProjectSetting;
+ }
+
+ public void setPermAllIssueAndProjectSetting(Boolean permAllIssueAndProjectSetting) {
+ this.permAllIssueAndProjectSetting = permAllIssueAndProjectSetting;
}
public Boolean getPermProjectSetting() {
@@ -168,6 +184,8 @@
public void makePermission() {
this.permission = MngPermission.USER_PERMISSION_MNG_NONE;
+ this.permission |= MngPermission.makePermission(getPermAllIssueAndProjectSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
+ this.permission |= MngPermission.makePermission(getPermPartnerSetting(), MngPermission.USER_PERMISSION_MNG_PARTNER);
this.permission |= MngPermission.makePermission(getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
this.permission |= MngPermission.makePermission(getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
--
Gitblit v1.8.0