From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정
---
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 50 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 34 insertions(+), 16 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 f78a811..d9902f4 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,9 +19,11 @@
private String basicUser;
private List<Long> removeIds = Lists.newArrayList();
+ public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
+ public Boolean permIssueSystemSetting;
public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
@@ -85,6 +85,22 @@
this.basicUser = basicUser;
}
+ public List<Long> getRemoveIds() {
+ return removeIds;
+ }
+
+ 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;
}
@@ -107,6 +123,14 @@
public void setPermIssueSetting(Boolean permIssueSetting) {
this.permIssueSetting = permIssueSetting;
+ }
+
+ public Boolean getPermIssueSystemSetting() {
+ return permIssueSystemSetting;
+ }
+
+ public void setPermIssueSystemSetting(Boolean permIssueSystemSetting) {
+ this.permIssueSystemSetting = permIssueSystemSetting;
}
public Boolean getPermApi() {
@@ -141,14 +165,6 @@
this.permQnA = permQnA;
}
- public Boolean getPermEvent() {
- return permEvent;
- }
-
- public void setPermEvent(Boolean permEvent) {
- this.permEvent = permEvent;
- }
-
public Boolean getPermGuide() {
return permGuide;
}
@@ -157,20 +173,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(getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
- this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
+ this.permission |= MngPermission.makePermission(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE);
+ this.permission |= MngPermission.makePermission(getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
+ this.permission |= MngPermission.makePermission(getPermIssueSystemSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
+ this.permission |= MngPermission.makePermission(getPermPartnerSetting(), MngPermission.USER_PERMISSION_MNG_PARTNER);
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);
--
Gitblit v1.8.0