From bf94f931589f27e00b5fcbf77124403d8c00aaeb Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 10 12월 2021 11:24:59 +0900
Subject: [PATCH] 전체 이슈 프로젝트 권한 수정
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 2
src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java | 19 +----
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 12 ++--
src/main/java/kr/wisestone/owl/vo/ManageUserVo.java | 6 -
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java | 6 -
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 13 +---
src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js | 3
src/main/java/kr/wisestone/owl/vo/UserLevelVo.java | 22 ++-----
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 2
src/main/webapp/views/workspace/workspaceLevelAdd.html | 2
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 22 ++-----
src/main/java/kr/wisestone/owl/constant/MngPermission.java | 8 +-
src/main/webapp/i18n/ko/global.json | 3
src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java | 3
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 3
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 6 -
16 files changed, 41 insertions(+), 91 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MngPermission.java b/src/main/java/kr/wisestone/owl/constant/MngPermission.java
index a322484..7e764b2 100644
--- a/src/main/java/kr/wisestone/owl/constant/MngPermission.java
+++ b/src/main/java/kr/wisestone/owl/constant/MngPermission.java
@@ -5,8 +5,7 @@
*/
public class MngPermission {
- public static final int USER_PERMISSION_MNG_ISSUE_ALL = 32768; // �쟾泥� �씠�뒋 愿�由�
- public static final int USER_PERMISSION_MNG_PROJECT_ALL = 16384; // �쟾泥� �봽濡쒖젥�듃 愿�由�
+ public static final int USER_PERMISSION_MNG_ISSUE_PROJECT_ALL = 16384; // �쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린
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
@@ -40,8 +39,7 @@
public static int makeAllPermission()
{
- return (USER_PERMISSION_MNG_ISSUE_ALL |
- USER_PERMISSION_MNG_PROJECT_ALL |
+ return (USER_PERMISSION_MNG_ISSUE_PROJECT_ALL |
USER_PERMISSION_MNG_PARTNER |
USER_PERMISSION_MNG_WORKSPACE |
USER_PERMISSION_MNG_PROJECT |
@@ -57,7 +55,7 @@
public static int makeSubAllPermission()
{
return (/*USER_PERMISSION_MNG_WORKSPACE |*/
- USER_PERMISSION_MNG_ISSUE_ALL | USER_PERMISSION_MNG_PROJECT_ALL |
+ USER_PERMISSION_MNG_ISSUE_PROJECT_ALL |
USER_PERMISSION_MNG_API | USER_PERMISSION_MNG_NOTICE |
USER_PERMISSION_MNG_FAQ | USER_PERMISSION_MNG_QNA |
USER_PERMISSION_MNG_EVENT | USER_PERMISSION_MNG_GUIDE |
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 76e1126..960b32e 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -751,7 +751,7 @@
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
results = this.issueMapper.find(issueCondition);
totalCount = this.issueMapper.count(issueCondition);
} else{
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 899e2f1..3af6486 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
@@ -95,8 +95,7 @@
public void modifyUserPermission(ManageUserForm manageUserForm) {
int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;
- newPermission |= MngPermission.makePermission(manageUserForm.getPermAllIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL);
- newPermission |= MngPermission.makePermission(manageUserForm.getPermAllProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT_ALL);
+ newPermission |= MngPermission.makePermission(manageUserForm.getPermAllIssueAndProjectSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
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);
diff --git a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
index 339af76..37ef059 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -368,7 +368,7 @@
// 愿�由ъ옄�씪 �븣
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
results = this.projectMapper.findByWorkspaceManager(condition);
totalCount = this.projectMapper.countByWorkspaceManager(condition);
}
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 899301b..eae1020 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -240,8 +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("permAllIssueSetting", this.messageAccessor.message("manageUser.manageAllIssuePerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("permAllProjectSetting", this.messageAccessor.message("manageUser.manageAllProjectPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("permAllIssueAndProjectSetting", this.messageAccessor.message("manageUser.manageAllIssueAndProjectPerm"), 3, 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));
@@ -263,8 +262,7 @@
public void modifyLevelPermission(UserLevelForm userLevelForm) {
int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;
- newPermission |= MngPermission.makePermission(userLevelForm.getPermAllIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL);
- newPermission |= MngPermission.makePermission(userLevelForm.getPermAllProjectSetting(), MngPermission.USER_PERMISSION_MNG_PROJECT_ALL);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermAllIssueAndProjectSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
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);
diff --git a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
index 9a28b83..2ae574f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -255,7 +255,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
remainIssue = this.widgetMapper.countRemainIssue(widgetCondition); // �옍�뿬 �씠�뒋
delayIssue = this.widgetMapper.countTodayDelayIssue(widgetCondition); // 吏��뿰�맂 �씠�뒋
assigneeIssue = this.widgetMapper.countAssigneeIssue(widgetCondition); // �븷�떦�맂 �씠�뒋
@@ -300,7 +300,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
progressingProjectDetails = this.widgetMapper.findProjectProgressAll(widgetCondition);
} else {
progressingProjectDetails = this.widgetMapper.findProjectProgress(widgetCondition);
@@ -510,7 +510,7 @@
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
List<Map<String, Object>> projectMemberIssues = Lists.newArrayList();
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
projectMemberIssues = this.widgetMapper.findProjectMemberIssue(widgetCondition);
} else {
projectMemberIssues = this.widgetMapper.findProjectMemberIssueByDepartment(widgetCondition);
@@ -798,7 +798,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
results = this.widgetMapper.findByStandIssueStatus(widgetCondition);
}else {
results = this.widgetMapper.findByStandIssueStatusOfDepartment(widgetCondition);
@@ -832,7 +832,7 @@
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
List<Map<String, Object>> issueTypeIssues = Lists.newArrayList();
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
issueTypeIssues = this.widgetMapper.findByStandIssueType(widgetCondition);
} else {
issueTypeIssues = this.widgetMapper.findByStandIssueTypeOfDepartment(widgetCondition);
@@ -917,7 +917,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
severityCounts = this.widgetMapper.countSeverityIssue(widgetCondition);
severityIssues = this.widgetMapper.findSeverityIssues(widgetCondition);
totalCount = this.widgetMapper.countSearchIssue(widgetCondition);
diff --git a/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java b/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
index c2827ac..d16de14 100644
--- a/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
@@ -13,8 +13,7 @@
private Integer permission;
private Long userId;
- public Boolean permAllIssueSetting;
- public Boolean permAllProjectSetting;
+ public Boolean permAllIssueAndProjectSetting;
public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
@@ -70,8 +69,7 @@
}
private void makePermission() {
- this.permAllIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_ALL);
- this.permAllProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT_ALL);
+ this.permAllIssueAndProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
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);
diff --git a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
index 3787a88..a1d1479 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
@@ -16,8 +16,7 @@
private String defaultYn;
private String basicUser;
- private Boolean permAllIssueSetting;
- private Boolean permAllProjectSetting;
+ private Boolean permAllIssueAndProjectSetting;
public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
@@ -158,25 +157,16 @@
this.permGuide = permGuide;
}
- 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 void toPermissionValues() {
- this.permAllIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_ALL);
- this.permAllProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT_ALL);
+ this.permAllIssueAndProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
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);
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 5dcbf93..e882937 100644
--- a/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
@@ -14,8 +14,7 @@
private Long id;
private Boolean useYn;
private Long userId;
- private Boolean permAllIssueSetting;
- private Boolean permAllProjectSetting;
+ private Boolean permAllIssueAndProjectSetting;
private Boolean permPartnerSetting;
private Boolean permWorkSpaceSetting;
private Boolean permProjectSetting;
@@ -139,19 +138,11 @@
this.permGuide = permGuide;
}
- 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;
}
}
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);
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 7523af5..572586f 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -110,8 +110,7 @@
common.remainIssue=\uC794\uC5EC \uC774\uC288
common.severityIssue=\uC911\uC694\uB3C4 \uBCC4 \uC774\uC288 \uD604\uD669
managementWorkspace.levelName=\uB4F1\uAE09\uBA85
-manageUser.manageAllIssuePerm=\uC804\uCCB4 \uC774\uC288 \uBCF4\uAE30
-manageUser.manageAllProjectPerm=\uC804\uCCB4 \uD504\uB85C\uC81D\uD2B8 \uBCF4\uAE30
+manageUser.manageAllIssueAndProjectPerm=\uC804\uCCB4 \uC774\uC288 \uD504\uB85C\uC81D\uD2B8 \uBCF4\uAE30
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
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 3099da6..8d581ed 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -537,12 +537,8 @@
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
- case "All_ISSUE_SETTING_PERM_YN" :
+ case "All_ISSUE_PROJECT_SETTING_PERM_YN" :
makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permAllIssueSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
- break;
-
- case "All_PROJECT_SETTING_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permAllProjectSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
break;
case "PARTNER_SETTING_PERM_YN" :
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index c647a9a..fd062aa 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -558,8 +558,7 @@
},
"manageUser": {
"manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
- "manageAllIssuePerm": "�쟾泥� �씠�뒋 蹂닿린",
- "manageAllProjectPerm": "�쟾泥� �봽濡쒖젥�듃 蹂닿린",
+ "manageAllIssueAndProjectPerm": "�쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린",
"managePartnerPerm" : "�뾽泥�/ISP/�샇�뒪�똿 愿�由�",
"manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
"manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
index 2097f1d..50db5a3 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
@@ -21,8 +21,7 @@
$scope.vm = {
form : {
levelName : "",
- permAllIssueSetting : false,
- permAllProjectSetting : false,
+ permAllIssueAndProjectSetting : false,
permPartnerSetting : false,
permWorkSpaceSetting : false,
permProjectSetting : false,
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index fc8d7d3..bfe1afe 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -189,19 +189,12 @@
.setDType("renderer")
.setDRenderer("USER_LEVEL_MODIFY"));
$scope.vm.tableConfigs1.push($tableProvider.config()
- .setHName("manageUser.manageAllIssuePerm")
+ .setHName("manageUser.manageAllIssueAndProjectPerm")
.setHWidth("width-120-p")
.setDType("renderer")
.setDAlign("text-center")
- .setDName("manageAllIssue")
- .setDRenderer("All_ISSUE_SETTING_PERM_YN"));
- $scope.vm.tableConfigs1.push($tableProvider.config()
- .setHName("manageUser.manageAllProjectPerm")
- .setHWidth("width-120-p")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDName("manageAllProject")
- .setDRenderer("All_PROJECT_SETTING_PERM_YN"));
+ .setDName("ViewAllIssueAndProject")
+ .setDRenderer("All_ISSUE_PROJECT_SETTING_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.managePartnerPerm")
.setHWidth("width-120-p")
diff --git a/src/main/webapp/views/workspace/workspaceLevelAdd.html b/src/main/webapp/views/workspace/workspaceLevelAdd.html
index e4f1f95..10a2f9f 100644
--- a/src/main/webapp/views/workspace/workspaceLevelAdd.html
+++ b/src/main/webapp/views/workspace/workspaceLevelAdd.html
@@ -35,7 +35,7 @@
<!--tableColumnGenerator.dirextive.js �뙆�씪 李멸퀬-->
<tr>
<td class="text-left bold">
- <span translate="manageUser.manageAllIssuePerm">�쟾泥� �씠�뒋 蹂닿린</span>
+ <span translate="manageUser.manageAllIssueAndProjectPerm">�쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린</span>
</td>
<td colspan="2">
<label class='switch'><input type='checkbox' ng-model='vm.form.permAllIssueSetting'><span class='slider round'></span></label>
--
Gitblit v1.8.0