From bf94f931589f27e00b5fcbf77124403d8c00aaeb Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 금, 10 12월 2021 11:24:59 +0900 Subject: [PATCH] 전체 이슈 프로젝트 권한 수정 --- src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 48 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 15 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 f78a811..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; @@ -85,12 +85,36 @@ this.basicUser = basicUser; } + public List<Long> getRemoveIds() { + return removeIds; + } + + public void setRemoveIds(List<Long> removeIds) { + 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() { @@ -141,14 +165,6 @@ this.permQnA = permQnA; } - public Boolean getPermEvent() { - return permEvent; - } - - public void setPermEvent(Boolean permEvent) { - this.permEvent = permEvent; - } - public Boolean getPermGuide() { return permGuide; } @@ -157,21 +173,23 @@ this.permGuide = permGuide; } - public List<Long> getRemoveIds() { - return removeIds; + public Boolean getPermEvent() { + return permEvent; } - public void setRemoveIds(List<Long> removeIds) { - this.removeIds = removeIds; + public void setPermEvent(Boolean permEvent) { + this.permEvent = permEvent; } 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(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING); this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API); + this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING); this.permission |= MngPermission.makePermission(getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE); this.permission |= MngPermission.makePermission(getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ); this.permission |= MngPermission.makePermission(getPermQnA(), MngPermission.USER_PERMISSION_MNG_QNA); -- Gitblit v1.8.0