From 06643b1e80b82d88f7aeb475a412c67dd5a59b36 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 화, 14 12월 2021 15:00:55 +0900
Subject: [PATCH] - api 입력시 등록자 정보가 안바뀌는 오류 수정 - 전체 검색시 페이지 벗어날 경우에만 기본 프로젝트/이슈타입 설정하도록 수정

---
 src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java |   22 ++++++----------------
 1 files changed, 6 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 adfa028..054ef41 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -19,8 +19,7 @@
     private String basicUser;
 
     private List<Long> removeIds = Lists.newArrayList();
-    public Boolean permAllIssueSetting;
-    public Boolean permAllProjectSetting;
+    public Boolean permAllIssueAndProjectSetting;
     public Boolean permPartnerSetting;
     public Boolean permWorkSpaceSetting;
     public Boolean permProjectSetting;
@@ -110,20 +109,12 @@
         this.permWorkSpaceSetting = permWorkSpaceSetting;
     }
 
-    public Boolean getPermAllIssueSetting() {
-        return permAllIssueSetting;
+    public Boolean getPermAllIssueAndProjectSetting() {
+        return permAllIssueAndProjectSetting;
     }
 
-    public void setPermAllIssueSetting(Boolean permAllIssueSetting) {
-        this.permAllIssueSetting = permAllIssueSetting;
-    }
-
-    public Boolean getPermAllProjectSetting() {
-        return permAllProjectSetting;
-    }
-
-    public void setPermAllProjectSetting(Boolean permAllProjectSetting) {
-        this.permAllProjectSetting = permAllProjectSetting;
+    public void setPermAllIssueAndProjectSetting(Boolean permAllIssueAndProjectSetting) {
+        this.permAllIssueAndProjectSetting = permAllIssueAndProjectSetting;
     }
 
     public Boolean getPermProjectSetting() {
@@ -193,8 +184,7 @@
     public void makePermission() {
         this.permission = MngPermission.USER_PERMISSION_MNG_NONE;
 
-        this.permission |= MngPermission.makePermission(getPermAllIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL);
-        this.permission |= MngPermission.makePermission(getPermAllProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT_ALL);
+        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);

--
Gitblit v1.8.0