From 7ee184b86e44fc96782b813ee10691cf1445a5b7 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 09 12월 2021 22:34:44 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 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 a196a0c..adfa028 100644 --- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java +++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java @@ -19,7 +19,9 @@ private String basicUser; private List<Long> removeIds = Lists.newArrayList(); - private Boolean permPartnerSetting; + public Boolean permAllIssueSetting; + public Boolean permAllProjectSetting; + public Boolean permPartnerSetting; public Boolean permWorkSpaceSetting; public Boolean permProjectSetting; public Boolean permIssueSetting; @@ -108,6 +110,22 @@ this.permWorkSpaceSetting = permWorkSpaceSetting; } + public Boolean getPermAllIssueSetting() { + return permAllIssueSetting; + } + + public void setPermAllIssueSetting(Boolean permAllIssueSetting) { + this.permAllIssueSetting = permAllIssueSetting; + } + + public Boolean getPermAllProjectSetting() { + return permAllProjectSetting; + } + + public void setPermAllProjectSetting(Boolean permAllProjectSetting) { + this.permAllProjectSetting = permAllProjectSetting; + } + public Boolean getPermProjectSetting() { return permProjectSetting; } @@ -175,6 +193,8 @@ public void makePermission() { this.permission = MngPermission.USER_PERMISSION_MNG_NONE; + this.permission |= MngPermission.makePermission(getPermAllIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL); + this.permission |= MngPermission.makePermission(getPermAllProjectSetting(), MngPermission.USER_PERMISSION_MNG_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); -- Gitblit v1.8.0