From ff2eacbedadcda1ecf23f5691ab60738be627bbe Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 26 11월 2021 11:47:23 +0900
Subject: [PATCH] 업체/ISP/호스팅 권한 추가
---
src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java | 9 ++++
src/main/java/kr/wisestone/owl/vo/UserLevelVo.java | 2 +
src/main/java/kr/wisestone/owl/vo/ManageUserVo.java | 3 +
src/main/webapp/scripts/config.js | 1
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 10 +++++
src/main/java/kr/wisestone/owl/constant/MngPermission.java | 32 ++++++++-------
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java | 2 +
src/main/webapp/i18n/ko/global.json | 3 +
src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java | 1
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 1
10 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MngPermission.java b/src/main/java/kr/wisestone/owl/constant/MngPermission.java
index 03cb3fd..bf0112f 100644
--- a/src/main/java/kr/wisestone/owl/constant/MngPermission.java
+++ b/src/main/java/kr/wisestone/owl/constant/MngPermission.java
@@ -5,18 +5,19 @@
*/
public class MngPermission {
- public static final int USER_PERMISSION_MNG_WORKSPACE = 4096; // WORK SPACE 愿�由� 1000000000000
- public static final int USER_PERMISSION_MNG_PROJECT = 2048; // �봽濡쒖젥�듃 愿�由� 0100000000000
- public static final int USER_PERMISSION_MNG_API = 1024; // API 愿�由� 0010000000000
- public static final int USER_PERMISSION_MNG_ISSUE_STATUS = 512; // ISSUE SETTING 愿�由� 0001000000000
- public static final int USER_PERMISSION_MNG_WORKFLOW = 256; // WORK FLOW 愿�由� 0000100000000
- public static final int USER_PERMISSION_MNG_CUSTOME_FIELD = 128; // �궗�슜�옄�젙�쓽 �븘�뱶 愿�由� 0000010000000
- public static final int USER_PERMISSION_MNG_ISSUE_TYPE = 64; // ISSUE TYPE 愿�由� 0000000100000
- public static final int USER_PERMISSION_MNG_NOTICE = 32; // ISSUE TYPE 愿�由� 0000000010000
- public static final int USER_PERMISSION_MNG_FAQ = 16; // FAQ 愿�由� 0000000001000
- public static final int USER_PERMISSION_MNG_QNA = 8; // 怨듭��궗�빆 愿�由� 0000000000100
- public static final int USER_PERMISSION_MNG_EVENT = 4; // 怨듭��궗�빆 愿�由� 0000000000010
- public static final int USER_PERMISSION_MNG_GUIDE = 2; // �궗�슜�옄 �븣由� 愿�由� 0000000000001
+ public static final int USER_PERMISSION_MNG_PARTNER = 8192; // �뾽泥�/ISP/�샇�뒪�똿 愿�由� 10000000000000
+ public static final int USER_PERMISSION_MNG_WORKSPACE = 4096; // WORK SPACE 愿�由� 01000000000000
+ public static final int USER_PERMISSION_MNG_PROJECT = 2048; // �봽濡쒖젥�듃 愿�由� 00100000000000
+ public static final int USER_PERMISSION_MNG_API = 1024; // API 愿�由� 00010000000000
+ public static final int USER_PERMISSION_MNG_ISSUE_STATUS = 512; // ISSUE SETTING 愿�由� 00001000000000
+ public static final int USER_PERMISSION_MNG_WORKFLOW = 256; // WORK FLOW 愿�由� 000000100000000
+ public static final int USER_PERMISSION_MNG_CUSTOME_FIELD = 128; // �궗�슜�옄�젙�쓽 �븘�뱶 愿�由� 00000010000000
+ public static final int USER_PERMISSION_MNG_ISSUE_TYPE = 64; // ISSUE TYPE 愿�由� 00000000100000
+ public static final int USER_PERMISSION_MNG_NOTICE = 32; // ISSUE TYPE 愿�由� 00000000010000
+ public static final int USER_PERMISSION_MNG_FAQ = 16; // FAQ 愿�由� 00000000001000
+ public static final int USER_PERMISSION_MNG_QNA = 8; // 怨듭��궗�빆 愿�由� 00000000000100
+ public static final int USER_PERMISSION_MNG_EVENT = 4; // 怨듭��궗�빆 愿�由� 00000000000010
+ public static final int USER_PERMISSION_MNG_GUIDE = 2; // �궗�슜�옄 �븣由� 愿�由� 00000000000001
public static final int USER_PERMISSION_MNG_NONE = 0; //
public static final int USER_PERMISSION_MNG_ISSUE_SETTING = (USER_PERMISSION_MNG_ISSUE_STATUS | USER_PERMISSION_MNG_WORKFLOW |
@@ -37,9 +38,10 @@
public static int makeAllPermission()
{
- return (USER_PERMISSION_MNG_WORKSPACE |
- USER_PERMISSION_MNG_PROJECT |
- USER_PERMISSION_MNG_API |
+ return (USER_PERMISSION_MNG_PARTNER |
+ USER_PERMISSION_MNG_WORKSPACE |
+ USER_PERMISSION_MNG_PROJECT |
+ USER_PERMISSION_MNG_API |
USER_PERMISSION_MNG_NOTICE |
USER_PERMISSION_MNG_FAQ |
USER_PERMISSION_MNG_QNA |
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
index 95be49a..7be22c2 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
@@ -95,6 +95,7 @@
public void modifyUserPermission(ManageUserForm manageUserForm) {
int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;
+ newPermission |= MngPermission.makePermission(manageUserForm.getPermPartnerSetting(), MngPermission.USER_PERMISSION_MNG_PARTNER);
newPermission |= MngPermission.makePermission(manageUserForm.getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
newPermission |= MngPermission.makePermission(manageUserForm.getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
newPermission |= MngPermission.makePermission(manageUserForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
diff --git a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
index dc6204a..2b98498 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -240,6 +240,7 @@
ExportExcelVo excelInfo = new ExportExcelVo();
excelInfo.setFileName(this.messageAccessor.message("�궗�슜�옄 紐⑸줉"));
excelInfo.addAttrInfos(new ExportExcelAttrVo("levelName", this.messageAccessor.message("managementWorkspace.levelName"), 6, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("permPartnerSetting", this.messageAccessor.message("manageUser.managePartnerPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permWorkSpaceSetting", this.messageAccessor.message("manageUser.manageWorkspacePerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permProjectSetting", this.messageAccessor.message("manageUser.manageProjectPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permIssueSetting", this.messageAccessor.message("manageUser.manageIssueSystemPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
@@ -260,6 +261,7 @@
public void modifyLevelPermission(UserLevelForm userLevelForm) {
int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermPartnerSetting(), MngPermission.USER_PERMISSION_MNG_PARTNER);
newPermission |= MngPermission.makePermission(userLevelForm.getPermWorkSpaceSetting(), MngPermission.USER_PERMISSION_MNG_WORKSPACE);
newPermission |= MngPermission.makePermission(userLevelForm.getPermProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT);
newPermission |= MngPermission.makePermission(userLevelForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
diff --git a/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java b/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
index dce086b..eb6c5ef 100644
--- a/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
@@ -12,6 +12,8 @@
private Boolean useYn;
private Integer permission;
private Long userId;
+
+ public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
@@ -66,6 +68,7 @@
}
private void makePermission() {
+ this.permPartnerSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PARTNER);
this.permWorkSpaceSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_WORKSPACE);
this.permProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT);
this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
diff --git a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
index d72868d..b607da1 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
@@ -16,6 +16,7 @@
private String defaultYn;
private String basicUser;
+ public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
@@ -156,6 +157,7 @@
}
public void toPermissionValues() {
+ this.permPartnerSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PARTNER);
this.permWorkSpaceSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_WORKSPACE);
this.permProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT);
this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
diff --git a/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java b/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
index eaddd72..045863b 100644
--- a/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
@@ -14,6 +14,7 @@
private Long id;
private Boolean useYn;
private Long userId;
+ private Boolean permPartnerSetting;
private Boolean permWorkSpaceSetting;
private Boolean permProjectSetting;
private Boolean permIssueSetting;
@@ -56,6 +57,14 @@
this.userId = userId;
}
+ public Boolean getPermPartnerSetting() {
+ return permPartnerSetting;
+ }
+
+ public void setPermPartnerSetting(Boolean permPartnerSetting) {
+ this.permPartnerSetting = permPartnerSetting;
+ }
+
public Boolean getPermWorkSpaceSetting() {
return permWorkSpaceSetting;
}
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..a196a0c 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -19,6 +19,7 @@
private String basicUser;
private List<Long> removeIds = Lists.newArrayList();
+ private Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
@@ -89,6 +90,14 @@
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() {
@@ -166,6 +175,7 @@
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(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index 94af71b..70ef9b3 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -108,6 +108,7 @@
common.remainIssue=\uC794\uC5EC \uC774\uC288
common.severityIssue=\uC911\uC694\uB3C4 \uBCC4 \uC774\uC288 \uD604\uD669
managementWorkspace.levelName=\uB4F1\uAE09\uBA85
+manageUser.managePartnerPerm=\uC5C5\uCCB4/ISP/\uD638\uC2A4\uD305 \uAD00\uB9AC
manageUser.manageWorkspacePerm=\uC6CC\uD06C\uC2A4\uD398\uC774\uC2A4 \uAD00\uB9AC
manageUser.manageProjectPerm=\uD504\uB85C\uC81D\uD2B8 \uAD00\uB9AC
manageUser.manageIssueSystemPerm=\uC774\uC288 \uC2DC\uC2A4\uD15C \uAD00\uB9AC
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index c584f6f..feba252 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -13,7 +13,7 @@
"processingRate": "泥섎━�쑉",
"dailyAverage": "�씪 �룊洹�",
"inProgressStatusOfProject": "吏꾪뻾以묒씤 �봽濡쒖젥�듃 �쁽�솴",
- "progressProject": "吏꾪뻾 �봽濡쒌뀋�젥�듃",
+ "progressProject": "吏꾪뻾 �봽濡쒖젥�듃",
"issueAll": "�쟾泥� �씠�뒋",
"projectProgress": "�봽濡쒖젥�듃 吏꾪뻾瑜�",
"admin": "愿�由ъ옄",
@@ -551,6 +551,7 @@
},
"manageUser": {
"manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
+ "managePartnerPerm" : "�뾽泥�/ISP/�샇�뒪�똿 愿�由�",
"manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
"manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
"manageIssueSystemPerm": "�씠�뒋 �떆�뒪�뀥 愿�由�",
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 15ad4c8..47b5db7 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -235,6 +235,7 @@
// 沅뚰븳 由ъ뒪�듃
$rootScope.mngPermission = {
+ "USER_PERMISSION_MNG_PARTNER" : 8192,
"USER_PERMISSION_MNG_WORKSPACE" : 4096,
"USER_PERMISSION_MNG_PROJECT" : 2048,
"USER_PERMISSION_MNG_API" : 1024,
--
Gitblit v1.8.0