From 69b42e5bab73a5bfc3e0d4ddc660877b0bc08c05 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 04 11월 2021 10:39:01 +0900
Subject: [PATCH] 사용자 등급 추가 오류 수정
---
src/main/java/kr/wisestone/owl/domain/UserLevel.java | 2 +
src/main/webapp/views/workspace/workspaceUserLevelConfig.html | 2
src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java | 10 ++--
src/main/java/kr/wisestone/owl/vo/ManageUserVo.java | 4 +-
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java | 13 ++++--
src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js | 2
src/main/java/kr/wisestone/owl/vo/UserLevelVo.java | 12 +++---
src/main/webapp/views/workspace/workspaceLevelAdd.html | 2
src/main/webapp/scripts/config.js | 4 +-
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 13 +++---
src/main/java/kr/wisestone/owl/constant/MngPermission.java | 6 +-
src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java | 2
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 11 +++++
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 2
14 files changed, 49 insertions(+), 36 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MngPermission.java b/src/main/java/kr/wisestone/owl/constant/MngPermission.java
index 6531dd9..03cb3fd 100644
--- a/src/main/java/kr/wisestone/owl/constant/MngPermission.java
+++ b/src/main/java/kr/wisestone/owl/constant/MngPermission.java
@@ -7,7 +7,7 @@
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_USER = 1024; // USER 愿�由� 0010000000000
+ 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
@@ -39,7 +39,7 @@
{
return (USER_PERMISSION_MNG_WORKSPACE |
USER_PERMISSION_MNG_PROJECT |
- USER_PERMISSION_MNG_USER |
+ USER_PERMISSION_MNG_API |
USER_PERMISSION_MNG_NOTICE |
USER_PERMISSION_MNG_FAQ |
USER_PERMISSION_MNG_QNA |
@@ -51,7 +51,7 @@
public static int makeSubAllPermission()
{
return (/*USER_PERMISSION_MNG_WORKSPACE |*/
- USER_PERMISSION_MNG_USER | USER_PERMISSION_MNG_NOTICE |
+ USER_PERMISSION_MNG_API | USER_PERMISSION_MNG_NOTICE |
USER_PERMISSION_MNG_FAQ | USER_PERMISSION_MNG_QNA |
USER_PERMISSION_MNG_EVENT | USER_PERMISSION_MNG_GUIDE |
USER_PERMISSION_MNG_ISSUE_SETTING);
diff --git a/src/main/java/kr/wisestone/owl/domain/UserLevel.java b/src/main/java/kr/wisestone/owl/domain/UserLevel.java
index 2171d8f..e6efc94 100644
--- a/src/main/java/kr/wisestone/owl/domain/UserLevel.java
+++ b/src/main/java/kr/wisestone/owl/domain/UserLevel.java
@@ -7,6 +7,8 @@
public class UserLevel extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
+ public static final String YN_FIELD_YES = "Y";
+ public static final String YN_FIELD_NO = "N";
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
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 60fc0e9..95be49a 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
@@ -98,7 +98,7 @@
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);
- newPermission |= MngPermission.makePermission(manageUserForm.getPermUser(), MngPermission.USER_PERMISSION_MNG_USER);
+ newPermission |= MngPermission.makePermission(manageUserForm.getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
newPermission |= MngPermission.makePermission(manageUserForm.getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE);
newPermission |= MngPermission.makePermission(manageUserForm.getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ);
newPermission |= MngPermission.makePermission(manageUserForm.getPermQnA(), MngPermission.USER_PERMISSION_MNG_QNA);
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 a175487..f1c5faa 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -71,21 +71,23 @@
@Override
public UserLevel addUserLevel(UserLevelForm userLevelForm) {
userLevelForm.makePermission();
+ userLevelForm.setDefaultYn(UserLevel.YN_FIELD_NO);
+ userLevelForm.setBasicUser(UserLevel.YN_FIELD_NO);
UserLevel userLevel = ConvertUtil.copyProperties(userLevelForm, UserLevel.class);
userLevelRepository.saveAndFlush(userLevel);
return userLevel;
}
@Override
public UserLevel addSuperUserLevel() {
- return addUserLevel("理쒓퀬愿�由ъ옄", MngPermission.makeAllPermission(),"Y", "N");
+ return addUserLevel("理쒓퀬愿�由ъ옄", MngPermission.makeAllPermission(),UserLevel.YN_FIELD_YES,UserLevel.YN_FIELD_NO);
}
public UserLevel addNormalUserLevel() {
- return addUserLevel("�씪諛섑쉶�썝", 0,"Y" , "Y");
+ return addUserLevel("�씪諛섑쉶�썝", 0,UserLevel.YN_FIELD_YES , UserLevel.YN_FIELD_YES);
}
public UserLevel addNormalAdminUserLevel() {
- return addUserLevel("�씪諛섍�由ъ옄", MngPermission.makeSubAllPermission(),"N", "N");
+ return addUserLevel("�씪諛섍�由ъ옄", MngPermission.makeSubAllPermission(),UserLevel.YN_FIELD_NO, UserLevel.YN_FIELD_NO);
}
// �궗�슜�옄 �벑湲� 異붽�
@@ -211,7 +213,7 @@
return userLevelVos;
}
- // �궗�슜�옄 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
+ // �궗�슜�옄�벑湲� 紐⑸줉�쓣 �뿊��濡� �떎�슫濡쒕뱶 �븳�떎.
@Override
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
ModelAndView modelAndView = this.workspaceService.checkUseExcelDownload(model);
@@ -234,13 +236,14 @@
vo.toPermissionValues();
}
+ // code_ko_KR �뿉 code紐� �꽕�젙
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("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));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("permUser", this.messageAccessor.message("manageUser.manageUserPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("permApi", this.messageAccessor.message("manageUser.manageUserPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permNotice", this.messageAccessor.message("manageUser.manageNoticePerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permFAQ", this.messageAccessor.message("manageUser.manageFAQPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permQnA", this.messageAccessor.message("manageUser.manageQnAPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
diff --git a/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java b/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
index ec442be..dce086b 100644
--- a/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
@@ -15,7 +15,7 @@
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
- public Boolean permUser;
+ public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
public Boolean permQnA;
@@ -69,7 +69,7 @@
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);
- this.permUser = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_USER);
+ this.permApi = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_API);
this.permNotice = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_NOTICE);
this.permFAQ = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_FAQ);
this.permQnA = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_QNA);
diff --git a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
index ec1fbdb..d72868d 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
@@ -19,7 +19,7 @@
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
- public Boolean permUser;
+ public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
public Boolean permQnA;
@@ -107,12 +107,12 @@
this.permIssueSetting = permIssueSetting;
}
- public Boolean getPermUser() {
- return permUser;
+ public Boolean getPermApi() {
+ return permApi;
}
- public void setPermUser(Boolean permUser) {
- this.permUser = permUser;
+ public void setPermApi(Boolean permApi) {
+ this.permApi = permApi;
}
public Boolean getPermNotice() {
@@ -159,7 +159,7 @@
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);
- this.permUser = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_USER);
+ this.permApi = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_API);
this.permNotice = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_NOTICE);
this.permFAQ = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_FAQ);
this.permQnA = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_QNA);
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 22c2b91..eaddd72 100644
--- a/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
@@ -17,7 +17,7 @@
private Boolean permWorkSpaceSetting;
private Boolean permProjectSetting;
private Boolean permIssueSetting;
- private Boolean permUser;
+ private Boolean permApi;
private Boolean permNotice;
private Boolean permFAQ;
private Boolean permQnA;
@@ -80,12 +80,12 @@
this.permIssueSetting = permIssueSetting;
}
- public Boolean getPermUser() {
- return permUser;
+ public Boolean getPermApi() {
+ return permApi;
}
- public void setPermUser(Boolean permUser) {
- this.permUser = permUser;
+ public void setPermApi(Boolean permApi) {
+ this.permApi = permApi;
}
public Boolean getPermNotice() {
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 f051733..57cab6a 100644
--- a/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java
@@ -24,7 +24,7 @@
public Boolean permWorkspaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
- public Boolean permUser;
+ public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
public Boolean permQnA;
@@ -41,7 +41,6 @@
if (MapUtil.getLongs(params, "removeIds") != null) {
form.setRemoveIds(MapUtil.getLongs(params, "removeIds"));
}
-
return form;
}
@@ -110,12 +109,12 @@
this.permIssueSetting = permIssueSetting;
}
- public Boolean getPermUser() {
- return permUser;
+ public Boolean getPermApi() {
+ return permApi;
}
- public void setPermUser(Boolean permUser) {
- this.permUser = permUser;
+ public void setPermApi(Boolean permApi) {
+ this.permApi = permApi;
}
public Boolean getPermNotice() {
@@ -172,7 +171,7 @@
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_SETTING);
- this.permission |= MngPermission.makePermission(getPermUser(), MngPermission.USER_PERMISSION_MNG_USER);
+ this.permission |= MngPermission.makePermission(getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
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);
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 9f6810b..51e1c4c 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -99,4 +99,13 @@
common.updateIssueType=\uC77C\uAC10 \uD0C0\uC785\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.updatePeriod=\uAE30\uAC04\uC774 \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
common.remainIssue=\uC794\uC5EC \uC77C\uAC10
-common.severityIssue=\uC911\uC694\uB3C4 \uBCC4 \uC77C\uAC10 \uD604\uD669
\ No newline at end of file
+common.severityIssue=\uC911\uC694\uB3C4 \uBCC4 \uC77C\uAC10 \uD604\uD669
+managementWorkspace.levelName=\uB4F1\uAE09\uBA85
+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
+manageUser.manageUserApi=Api \uAD00\uB9AC
+manageUser.manageNoticePerm=\uACF5\uC9C0\uC0AC\uD56D \uAD00\uB9AC
+manageUser.manageFAQPerm=FAQ \uAD00\uB9AC
+manageUser.manageQnAPerm=QnA \uAD00\uB9AC
+manageUser.manageGuidePerm=\uAC00\uC774\uB4DC \uAD00\uB9AC
\ No newline at end of file
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index f512ef3..b91251a 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -305,7 +305,7 @@
break;
case "USER_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permUser' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permApi' ng-click='event.modifyUserPermission(data)'><span class='slider round'></span></label>";
break;
case "NOTICE_PERM_YN" :
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
index ccf534a..1045f3c 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
@@ -24,7 +24,7 @@
permWorkspaceSetting : false,
permProjectSetting : false,
permIssueSetting : false,
- permUser : false,
+ permApi : false,
permNotice : false,
permFAQ : false,
permQnA : false,
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 8a810db..39cf630 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -233,7 +233,7 @@
$rootScope.mngPermission = {
"USER_PERMISSION_MNG_WORKSPACE" : 4096,
"USER_PERMISSION_MNG_PROJECT" : 2048,
- "USER_PERMISSION_MNG_USER" : 1024,
+ "USER_PERMISSION_MNG_API" : 1024,
"USER_PERMISSION_MNG_ISSUE_STATUS" : 512,
"USER_PERMISSION_MNG_WORKFLOW" : 256,
"USER_PERMISSION_MNG_CUSTOME_FIELD" : 128,
@@ -284,7 +284,7 @@
return false;
}
- var permissionVal = $rootScope.mngPermission['USER_PERMISSION_MNG_USER'];
+ var permissionVal = $rootScope.mngPermission['USER_PERMISSION_MNG_API'];
permissionVal += $rootScope.mngPermission['USER_PERMISSION_MNG_NOTICE'];
permissionVal += $rootScope.mngPermission['USER_PERMISSION_MNG_FAQ'];
permissionVal += $rootScope.mngPermission['USER_PERMISSION_MNG_QNA'];
diff --git a/src/main/webapp/views/workspace/workspaceLevelAdd.html b/src/main/webapp/views/workspace/workspaceLevelAdd.html
index e99c0c5..caa1e51 100644
--- a/src/main/webapp/views/workspace/workspaceLevelAdd.html
+++ b/src/main/webapp/views/workspace/workspaceLevelAdd.html
@@ -62,7 +62,7 @@
<span translate="manageUser.manageUserPerm">�궗�슜�옄 愿�由�</span>
</td>
<td>
- <label class='switch'><input type='checkbox' ng-model='vm.form.permUser'><span class='slider round'></span></label>
+ <label class='switch'><input type='checkbox' ng-model='vm.form.permApi'><span class='slider round'></span></label>
</td>
</tr>
<tr>
diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
index c0e2b6f..8df62d9 100644
--- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
@@ -44,7 +44,7 @@
</label>
</div>
</div>
- <div class="col-sm-6 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_USER')">
+ <div class="col-sm-6 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_API')">
<form class="form-inline justify-content-sm-end pull-right ng-pristine ng-valid" method="post" action="/userLevel/downloadExcel" name="userLevelListForm">
<input type="hidden" name="conditions" autocomplete="off">
<div class="btn-group">
--
Gitblit v1.8.0