From 2fed2749b65c7926ab20fc45a830f5d84adaff41 Mon Sep 17 00:00:00 2001 From: jinhyuk jang <imlovee@naver.com> Date: 일, 12 12월 2021 23:22:00 +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