From cf362cbfd4a92b5e42f0d3992baad3a7d3295366 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 12:52:36 +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 | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 29438da..57cab6a 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 permProjectSetting;
public Boolean permIssueSetting;
- public Boolean permUser;
+ public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
public Boolean permQnA;
@@ -39,7 +41,6 @@
if (MapUtil.getLongs(params, "removeIds") != null) {
form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
}
-
return form;
}
@@ -68,6 +69,22 @@
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 Boolean getPermWorkspaceSetting() {
return permWorkspaceSetting;
}
@@ -92,12 +109,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() {
@@ -154,7 +171,7 @@
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(getPermUser(), MngPermission.USER_PERMISSION_MNG_USER);
+ this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
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