From 8cdee12102d831355c2be8fedff2d7f26cb0931b Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 16 12월 2021 19:02:28 +0900
Subject: [PATCH] - 프로젝트내 이슈유형에 설정된 사용자 정의 필드가 없을 경우 오류 예외 처리(api 입력 안되는 원인이었음)
---
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 054ef41..d9902f4 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -19,11 +19,11 @@
private String basicUser;
private List<Long> removeIds = Lists.newArrayList();
- public Boolean permAllIssueAndProjectSetting;
public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
+ public Boolean permIssueSystemSetting;
public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
@@ -109,14 +109,6 @@
this.permWorkSpaceSetting = permWorkSpaceSetting;
}
- public Boolean getPermAllIssueAndProjectSetting() {
- return permAllIssueAndProjectSetting;
- }
-
- public void setPermAllIssueAndProjectSetting(Boolean permAllIssueAndProjectSetting) {
- this.permAllIssueAndProjectSetting = permAllIssueAndProjectSetting;
- }
-
public Boolean getPermProjectSetting() {
return permProjectSetting;
}
@@ -131,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() {
@@ -184,12 +184,12 @@
public void makePermission() {
this.permission = MngPermission.USER_PERMISSION_MNG_NONE;
- this.permission |= MngPermission.makePermission(getPermAllIssueAndProjectSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
- 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(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(getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
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