From 72cbca5a2e1263ad691bc7b3c0080691640309ab Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 25 11월 2021 11:18:01 +0900
Subject: [PATCH] 충돌 수정
---
src/main/java/kr/wisestone/owl/vo/UserLevelVo.java | 76 +++++++++++++++++++++++++++++++++++++-
1 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
index 50c74f0..d72868d 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
@@ -19,7 +19,7 @@
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
- public Boolean permUser;
+ public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
public Boolean permQnA;
@@ -83,11 +83,83 @@
this.modifyPermissionCheck = modifyPermissionCheck;
}
+ public Boolean getPermWorkSpaceSetting() {
+ return permWorkSpaceSetting;
+ }
+
+ public void setPermWorkSpaceSetting(Boolean permWorkSpaceSetting) {
+ this.permWorkSpaceSetting = permWorkSpaceSetting;
+ }
+
+ public Boolean getPermProjectSetting() {
+ return permProjectSetting;
+ }
+
+ public void setPermProjectSetting(Boolean permProjectSetting) {
+ this.permProjectSetting = permProjectSetting;
+ }
+
+ public Boolean getPermIssueSetting() {
+ return permIssueSetting;
+ }
+
+ public void setPermIssueSetting(Boolean permIssueSetting) {
+ this.permIssueSetting = permIssueSetting;
+ }
+
+ public Boolean getPermApi() {
+ return permApi;
+ }
+
+ public void setPermApi(Boolean permApi) {
+ this.permApi = permApi;
+ }
+
+ public Boolean getPermNotice() {
+ return permNotice;
+ }
+
+ public void setPermNotice(Boolean permNotice) {
+ this.permNotice = permNotice;
+ }
+
+ public Boolean getPermFAQ() {
+ return permFAQ;
+ }
+
+ public void setPermFAQ(Boolean permFAQ) {
+ this.permFAQ = permFAQ;
+ }
+
+ public Boolean getPermQnA() {
+ return permQnA;
+ }
+
+ public void setPermQnA(Boolean permQnA) {
+ this.permQnA = permQnA;
+ }
+
+ public Boolean getPermEvent() {
+ return permEvent;
+ }
+
+ public void setPermEvent(Boolean permEvent) {
+ this.permEvent = permEvent;
+ }
+
+ public Boolean getPermGuide() {
+ return permGuide;
+ }
+
+ public void setPermGuide(Boolean permGuide) {
+ this.permGuide = permGuide;
+ }
+
public void toPermissionValues() {
this.permWorkSpaceSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_WORKSPACE);
this.permProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT);
this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
- this.permUser = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_USER);
+ this.permApi = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_API);
this.permNotice = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_NOTICE);
this.permFAQ = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_FAQ);
this.permQnA = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_QNA);
--
Gitblit v1.8.0