From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001 From: minhee <alsdldlfrl@gmail.com> Date: 화, 15 3월 2022 12:12:17 +0900 Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가 --- src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 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 a196a0c..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,10 +19,11 @@ private String basicUser; private List<Long> removeIds = Lists.newArrayList(); - private Boolean permPartnerSetting; + public Boolean permPartnerSetting; public Boolean permWorkSpaceSetting; public Boolean permProjectSetting; public Boolean permIssueSetting; + public Boolean permIssueSystemSetting; public Boolean permApi; public Boolean permNotice; public Boolean permFAQ; @@ -124,6 +125,14 @@ this.permIssueSetting = permIssueSetting; } + public Boolean getPermIssueSystemSetting() { + return permIssueSystemSetting; + } + + public void setPermIssueSystemSetting(Boolean permIssueSystemSetting) { + this.permIssueSystemSetting = permIssueSystemSetting; + } + public Boolean getPermApi() { return permApi; } @@ -175,11 +184,12 @@ public void makePermission() { this.permission = MngPermission.USER_PERMISSION_MNG_NONE; - 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