From eee313007ce5c4f0879d764d56d3a1ba93f6fb37 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 16:33:49 +0900
Subject: [PATCH] 대시보드 - 멤버별 진행률 완료 및 오류 수정
---
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 61 +++++++++++++++++-------------
1 files changed, 34 insertions(+), 27 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 f051733..a196a0c 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,10 +19,11 @@
private String basicUser;
private List<Long> removeIds = Lists.newArrayList();
- public Boolean permWorkspaceSetting;
+ private Boolean permPartnerSetting;
+ public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
- public Boolean permUser;
+ public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
public Boolean permQnA;
@@ -41,7 +40,6 @@
if (MapUtil.getLongs(params, "removeIds") != null) {
form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
}
-
return form;
}
@@ -86,12 +84,28 @@
this.basicUser = basicUser;
}
- public Boolean getPermWorkspaceSetting() {
- return permWorkspaceSetting;
+ public List<Long> getRemoveIds() {
+ return removeIds;
}
- public void setPermWorkspaceSetting(Boolean permWorkspaceSetting) {
- this.permWorkspaceSetting = permWorkspaceSetting;
+ 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 getPermProjectSetting() {
@@ -110,12 +124,12 @@
this.permIssueSetting = permIssueSetting;
}
- public Boolean getPermUser() {
- return permUser;
+ public Boolean getPermApi() {
+ return permApi;
}
- public void setPermUser(Boolean permUser) {
- this.permUser = permUser;
+ public void setPermApi(Boolean permApi) {
+ this.permApi = permApi;
}
public Boolean getPermNotice() {
@@ -142,14 +156,6 @@
this.permQnA = permQnA;
}
- public Boolean getPermEvent() {
- return permEvent;
- }
-
- public void setPermEvent(Boolean permEvent) {
- this.permEvent = permEvent;
- }
-
public Boolean getPermGuide() {
return permGuide;
}
@@ -158,21 +164,22 @@
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(getPermWorkspaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
+ 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);
this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
- this.permission |= MngPermission.makePermission(getPermUser(), MngPermission.USER_PERMISSION_MNG_USER);
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