From 23eb90bb1966d755db23025489fc56a75dac6d2a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 18:55:10 +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 | 73 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 28 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 047cdc1..b8e4dce 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -17,12 +17,14 @@
private Long id;
private String levelName;
private Integer permission;
+ private String defaultYn;
+ private String basicUser;
private List<Long> removeIds = Lists.newArrayList();
- public Boolean permWorkspaceSetting;
+ public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
- public Boolean permUser;
+ public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
public Boolean permQnA;
@@ -39,16 +41,8 @@
if (MapUtil.getLongs(params, "removeIds") != null) {
form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
}
-
return form;
- }
- public Boolean getPermWorkspaceSetting() {
- return permWorkspaceSetting;
- }
-
- public void setPermWorkspaceSetting(Boolean permWorkspaceSetting) {
- this.permWorkspaceSetting = permWorkspaceSetting;
}
public Long getId() {
@@ -75,6 +69,37 @@
this.permission = permission;
}
+ public String getDefaultYn() {
+ return defaultYn;
+ }
+
+ public void setDefaultYn(String defaultYn) {
+ this.defaultYn = defaultYn;
+ }
+
+ public String getBasicUser() {
+ return basicUser;
+ }
+
+ public void setBasicUser(String basicUser) {
+ this.basicUser = basicUser;
+ }
+
+ public List<Long> getRemoveIds() {
+ return removeIds;
+ }
+
+ public void setRemoveIds(List<Long> removeIds) {
+ this.removeIds = removeIds;
+ }
+
+ public Boolean getPermWorkSpaceSetting() {
+ return permWorkSpaceSetting;
+ }
+
+ public void setPermWorkSpaceSetting(Boolean permWorkSpaceSetting) {
+ this.permWorkSpaceSetting = permWorkSpaceSetting;
+ }
public Boolean getPermProjectSetting() {
return permProjectSetting;
@@ -92,12 +117,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() {
@@ -124,14 +149,6 @@
this.permQnA = permQnA;
}
- public Boolean getPermEvent() {
- return permEvent;
- }
-
- public void setPermEvent(Boolean permEvent) {
- this.permEvent = permEvent;
- }
-
public Boolean getPermGuide() {
return permGuide;
}
@@ -140,21 +157,21 @@
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(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