From f919af96e5e083ad462a5e71c00ff148ebdb91c6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 15:23:28 +0900
Subject: [PATCH] - 오토 컴플릿 항목 선택하면 목록 사라지게 수정 - 업체 메일 발송 시 템플릿 선택 문구 변경 - 연락처 입력 폼 정규식 제거하고 숫자만 입력 가능하게 수정 - 모든 사용자 필드(날짜) 24시간 타입으로 변경
---
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 62f3bb1..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,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;
@@ -91,6 +93,14 @@
this.removeIds = removeIds;
}
+ public Boolean getPermPartnerSetting() {
+ return permPartnerSetting;
+ }
+
+ public void setPermPartnerSetting(Boolean permPartnerSetting) {
+ this.permPartnerSetting = permPartnerSetting;
+ }
+
public Boolean getPermWorkSpaceSetting() {
return permWorkSpaceSetting;
}
@@ -113,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() {
@@ -166,10 +184,12 @@
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);
+ 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