From 4d06a7593fba3df556fc3728c142554907c6b157 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 10:46:45 +0900
Subject: [PATCH] '전체 이슈 프로젝트 보기' 권한 '이슈 관리' 권한으로 변경 - 이슈관리: 모든 이슈 수정 가능
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 11 ++
src/main/webapp/scripts/app/manageUser/manageUser.controller.js | 15 +++
src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java | 12 +-
src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java | 14 +-
src/main/java/kr/wisestone/owl/vo/ManageUserVo.java | 6
src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java | 10 +-
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 34 ++++----
src/main/java/kr/wisestone/owl/domain/Issue.java | 3
src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js | 2
src/main/java/kr/wisestone/owl/vo/UserLevelVo.java | 24 +++---
src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java | 9 -
src/main/webapp/views/workspace/workspaceLevelAdd.html | 22 +++-
src/main/webapp/scripts/config.js | 4
src/main/java/kr/wisestone/owl/web/form/UserLevelForm.java | 26 +++---
src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js | 2
src/main/java/kr/wisestone/owl/constant/MngPermission.java | 6
src/main/webapp/i18n/ko/global.json | 4
src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java | 4
src/main/webapp/WEB-INF/i18n/code_ko_KR.properties | 2
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 4
20 files changed, 120 insertions(+), 94 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/constant/MngPermission.java b/src/main/java/kr/wisestone/owl/constant/MngPermission.java
index 44e005f..405737d 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 = 16384; // WORK SPACE 愿�由� 01000000000000
public static final int USER_PERMISSION_MNG_PROJECT = 8192; // �봽濡쒖젥�듃 愿�由� 00100000000000
- public static final int USER_PERMISSION_MNG_ISSUE_PROJECT_ALL = 4096; // �쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린
+ public static final int USER_PERMISSION_MNG_ISSUE = 4096; // �씠�뒋 愿�由�
public static final int USER_PERMISSION_MNG_PARTNER = 2048; // �뾽泥�/ISP/�샇�뒪�똿 愿�由� 10000000000000
public static final int USER_PERMISSION_MNG_API = 1024; // API 愿�由� 00010000000000
public static final int USER_PERMISSION_MNG_ISSUE_STATUS = 512; // ISSUE SETTING 愿�由� 00001000000000
@@ -39,7 +39,7 @@
public static int makeAllPermission()
{
- return (USER_PERMISSION_MNG_ISSUE_PROJECT_ALL |
+ return (USER_PERMISSION_MNG_ISSUE |
USER_PERMISSION_MNG_PARTNER |
USER_PERMISSION_MNG_WORKSPACE |
USER_PERMISSION_MNG_PROJECT |
@@ -55,7 +55,7 @@
public static int makeSubAllPermission()
{
return (/*USER_PERMISSION_MNG_WORKSPACE |*/
- USER_PERMISSION_MNG_ISSUE_PROJECT_ALL |
+ USER_PERMISSION_MNG_ISSUE |
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/domain/Issue.java b/src/main/java/kr/wisestone/owl/domain/Issue.java
index 90cc583..6b35bc3 100644
--- a/src/main/java/kr/wisestone/owl/domain/Issue.java
+++ b/src/main/java/kr/wisestone/owl/domain/Issue.java
@@ -18,8 +18,7 @@
private static final long serialVersionUID = 1L;
public static final String WORKSPACE_MANAGER = "WORKSPACE_MANAGER"; // �뾽臾� 怨듦컙 愿�由ъ옄
public static final String PROJECT_MANAGER = "PROJECT_MANAGER"; // �봽濡쒖젥�듃 愿�由ъ옄
- public static final String ALL_ISSUE_MANAGER = "ALL_ISSUE_MANAGER"; // �쟾泥� �씠�뒋 愿�由ъ옄
- public static final String ALL_PROJECT_MANAGER = "ALL_PROJECT_MANAGER"; // �쟾泥� �봽濡쒖젥�듃 愿�由ъ옄
+ public static final String ISSUE_MANAGER = "ISSUE_MANAGER"; // �쟾泥� �씠�뒋 愿�由ъ옄
public static final String REGISTER = "REGISTER"; // �씠�뒋 �벑濡앹옄
public static final String ASSIGNEE = "ASSIGNEE"; // �씠�뒋 �떞�떦�옄
public static final String DEPARTMENT = "DEPARTMENT"; // �씠�뒋 �떞�떦遺��꽌
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 485a1d9..c2d6601 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -776,7 +776,7 @@
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
this.SetAllDepartmentId(issueCondition);
} else{
this.SetMyDepartmentId(issueCondition);
@@ -1138,7 +1138,7 @@
List<Map<String, Object>> projects = null;
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
projects = this.projectMapper.findByWorkspaceManagerAll(projectCondition);
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(projectCondition);
@@ -1996,6 +1996,8 @@
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.WORKSPACE_MANAGER, issueVo, null, null, user);
// �봽濡쒖젥�듃 愿�由ъ옄�씪 寃쎌슦 �빐�떦 �봽濡쒖젥�듃�뿉 �벑濡앸맂 �씠�뒋�뒗 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.PROJECT_MANAGER, issueVo, null, null, user);
+ // �씠�뒋 愿�由ъ옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
+ hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.ISSUE_MANAGER, issueVo, null, null, user);
// �씠�뒋 �벑濡앹옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
hasPermission = this.checkIssueModifyPermission(hasPermission, Issue.REGISTER, issueVo, null, null, user);
// �씠�뒋 �떞�떦�옄�씪 寃쎌슦 �닔�젙 沅뚰븳�쓣 媛뽯뒗�떎.
@@ -2025,6 +2027,11 @@
hasPermission = this.projectRoleUserService.checkProjectManager(issue.getProject(), user);
break;
+ case Issue.ISSUE_MANAGER: // �씠�뒋 愿�由ъ옄
+ UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
+ hasPermission = MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE);
+ break;
+
case Issue.REGISTER: // �씠�뒋 �벑濡앹옄
hasPermission = issueVo.getRegisterId().equals(user.getId());
break;
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 3af6486..d8e8e35 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ManageUserServiceImpl.java
@@ -95,11 +95,11 @@
public void modifyUserPermission(ManageUserForm manageUserForm) {
int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;
- newPermission |= MngPermission.makePermission(manageUserForm.getPermAllIssueAndProjectSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
+ newPermission |= MngPermission.makePermission(manageUserForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE);
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);
+ newPermission |= MngPermission.makePermission(manageUserForm.getPermIssueSystemSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
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);
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 54a9c67..55a5b18 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/ProjectServiceImpl.java
@@ -368,8 +368,7 @@
// 愿�由ъ옄�씪 �븣
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
results = this.projectMapper.findByWorkspaceManager(condition);
totalCount = this.projectMapper.countByWorkspaceManager(condition);
}
@@ -1137,8 +1136,7 @@
List<Map<String, Object>> results;
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
results = this.projectMapper.findByWorkspaceManager(projectCondition);
} else {
results = this.projectMapper.findByWorkspaceIdAndIncludeProject(projectCondition);
@@ -1175,8 +1173,7 @@
UserLevel userLevel = this.userLevelService.getUserLevel(user.getUserLevel().getId());
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
results = this.projectMapper.findByWorkspaceManager(projectCondition);
}
else {
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 18831c2..1f0f7c9 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/UserLevelServiceImpl.java
@@ -245,11 +245,11 @@
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("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));
- excelInfo.addAttrInfos(new ExportExcelAttrVo("permIssueSetting", this.messageAccessor.message("manageUser.manageIssueSystemPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("permIssueSetting", this.messageAccessor.message("manageUser.manageIssuePerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
+ excelInfo.addAttrInfos(new ExportExcelAttrVo("permIssueSystemSetting", this.messageAccessor.message("manageUser.manageIssueSystemPerm"), 3, ExportExcelAttrVo.ALIGN_CENTER));
excelInfo.addAttrInfos(new ExportExcelAttrVo("permApi", this.messageAccessor.message("manageUser.manageUserApi"), 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));
@@ -272,11 +272,11 @@
try {
Map<String, Object> result = new HashMap<>();
result.put("levelName", userLevelVo.getLevelName());
- result.put("permAllIssueAndProjectSetting", userLevelVo.getPermAllIssueAndProjectSetting());
result.put("permPartnerSetting", userLevelVo.getPermPartnerSetting());
result.put("permWorkSpaceSetting", userLevelVo.getPermWorkSpaceSetting());
result.put("permProjectSetting", userLevelVo.getPermProjectSetting());
result.put("permIssueSetting", userLevelVo.getPermIssueSetting());
+ result.put("permIssueSystemSetting", userLevelVo.getPermIssueSystemSetting());
result.put("permApi", userLevelVo.getPermApi());
result.put("permNotice", userLevelVo.getPermNotice());
result.put("permFAQ", userLevelVo.getPermFAQ());
@@ -296,11 +296,11 @@
public void modifyLevelPermission(UserLevelForm userLevelForm) {
int newPermission = MngPermission.USER_PERMISSION_MNG_NONE;
- 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);
- newPermission |= MngPermission.makePermission(userLevelForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermIssueSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE);
+ newPermission |= MngPermission.makePermission(userLevelForm.getPermIssueSystemSetting(), MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
newPermission |= MngPermission.makePermission(userLevelForm.getPermApi(), MngPermission.USER_PERMISSION_MNG_API);
newPermission |= MngPermission.makePermission(userLevelForm.getPermNotice(), MngPermission.USER_PERMISSION_MNG_NOTICE);
newPermission |= MngPermission.makePermission(userLevelForm.getPermFAQ(), MngPermission.USER_PERMISSION_MNG_FAQ);
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 510d85c..343639d 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/WidgetServiceImpl.java
@@ -172,7 +172,7 @@
// �빐�떦 �썙�겕�뒪�럹�씠�뒪�뿉�꽌 李몄뿬�븯怨� �엳�뒗 �봽濡쒖젥�듃 以� �긽�깭媛� �삤�뵂�씤 �봽濡쒖젥�듃
List<Map<String, Object>> projects = null;
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
projects = this.projectService.findByWorkspaceManagerAll();
} else {
projects = this.projectService.findByWorkspaceIdAndIncludeProjectAll(Lists.newArrayList("02"), ProjectType.BTS_PROJECT.toString());
@@ -257,7 +257,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
remainIssue = this.widgetMapper.countRemainIssue(widgetCondition); // �옍�뿬 �씠�뒋
delayIssue = this.widgetMapper.countTodayDelayIssue(widgetCondition); // 吏��뿰�맂 �씠�뒋
assigneeIssue = this.widgetMapper.countAssigneeIssue(widgetCondition); // �븷�떦�맂 �씠�뒋
@@ -302,7 +302,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
progressingProjectDetails = this.widgetMapper.findProjectProgressAll(widgetCondition);
} else {
progressingProjectDetails = this.widgetMapper.findProjectProgress(widgetCondition);
@@ -513,7 +513,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_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_PROJECT)) {
projectMemberIssues = this.widgetMapper.findProjectMemberIssue(widgetCondition);
} else {
projectMemberIssues = this.widgetMapper.findProjectMemberIssueByDepartment(widgetCondition);
@@ -801,7 +801,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
results = this.widgetMapper.findByStandIssueStatus(widgetCondition);
}else {
results = this.widgetMapper.findByStandIssueStatusOfDepartment(widgetCondition);
@@ -835,7 +835,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_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
issueTypeIssues = this.widgetMapper.findByStandIssueType(widgetCondition);
} else {
issueTypeIssues = this.widgetMapper.findByStandIssueTypeOfDepartment(widgetCondition);
@@ -920,7 +920,7 @@
if (widgetCondition.getProjectIds().size() > 0) {
SetMeAndDownProjectIds(widgetCondition.getProjectIds(), widgetCondition);
if (this.userWorkspaceService.checkWorkspaceManager(user)
- || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL)) {
+ || MngPermission.checkMngPermission(userLevel.getPermission(), MngPermission.USER_PERMISSION_MNG_ISSUE)) {
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 d16de14..24e8e18 100644
--- a/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/ManageUserVo.java
@@ -13,11 +13,11 @@
private Integer permission;
private Long userId;
- public Boolean permAllIssueAndProjectSetting;
public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
+ public Boolean permIssueSystemSetting;
public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
@@ -69,11 +69,11 @@
}
private void makePermission() {
- this.permAllIssueAndProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
+ this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE);
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);
+ this.permIssueSystemSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
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);
diff --git a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
index 0884354..3bc95c3 100644
--- a/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
+++ b/src/main/java/kr/wisestone/owl/vo/UserLevelVo.java
@@ -16,11 +16,11 @@
private String defaultYn;
private String basicUser;
- private Boolean permAllIssueAndProjectSetting;
public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
+ public Boolean permIssueSystemSetting;
public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
@@ -157,16 +157,16 @@
this.permGuide = permGuide;
}
- public Boolean getPermAllIssueAndProjectSetting() {
- return permAllIssueAndProjectSetting;
- }
-
- public void setPermAllIssueAndProjectSetting(Boolean permAllIssueAndProjectSetting) {
- this.permAllIssueAndProjectSetting = permAllIssueAndProjectSetting;
- }
-
public Boolean getPermPartnerSetting() {
return permPartnerSetting;
+ }
+
+ public Boolean getPermIssueSystemSetting() {
+ return permIssueSystemSetting;
+ }
+
+ public void setPermIssueSystemSetting(Boolean permIssueSystemSetting) {
+ this.permIssueSystemSetting = permIssueSystemSetting;
}
public void setPermPartnerSetting(Boolean permPartnerSetting) {
@@ -174,11 +174,11 @@
}
public void toPermissionValues() {
- this.permAllIssueAndProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_PROJECT_ALL);
+ this.permProjectSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_PROJECT);
+ this.permIssueSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE);
+ this.permIssueSystemSetting = MngPermission.checkMngPermission(this.permission, MngPermission.USER_PERMISSION_MNG_ISSUE_SETTING);
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);
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);
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 e882937..75a69a1 100644
--- a/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
+++ b/src/main/java/kr/wisestone/owl/web/form/ManageUserForm.java
@@ -14,11 +14,11 @@
private Long id;
private Boolean useYn;
private Long userId;
- private Boolean permAllIssueAndProjectSetting;
private Boolean permPartnerSetting;
private Boolean permWorkSpaceSetting;
private Boolean permProjectSetting;
private Boolean permIssueSetting;
+ private Boolean permIssueSystemSetting;
private Boolean permApi;
private Boolean permNotice;
private Boolean permFAQ;
@@ -138,11 +138,13 @@
this.permGuide = permGuide;
}
- public Boolean getPermAllIssueAndProjectSetting() {
- return permAllIssueAndProjectSetting;
+ public Boolean getPermIssueSystemSetting() {
+ return permIssueSystemSetting;
}
- public void setPermAllIssueAndProjectSetting(Boolean permAllIssueAndProjectSetting) {
- this.permAllIssueAndProjectSetting = permAllIssueAndProjectSetting;
+ public void setPermIssueSystemSetting(Boolean permIssueSystemSetting) {
+ this.permIssueSystemSetting = permIssueSystemSetting;
}
+
+
}
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 054ef41..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,11 +19,11 @@
private String basicUser;
private List<Long> removeIds = Lists.newArrayList();
- public Boolean permAllIssueAndProjectSetting;
public Boolean permPartnerSetting;
public Boolean permWorkSpaceSetting;
public Boolean permProjectSetting;
public Boolean permIssueSetting;
+ public Boolean permIssueSystemSetting;
public Boolean permApi;
public Boolean permNotice;
public Boolean permFAQ;
@@ -109,14 +109,6 @@
this.permWorkSpaceSetting = permWorkSpaceSetting;
}
- public Boolean getPermAllIssueAndProjectSetting() {
- return permAllIssueAndProjectSetting;
- }
-
- public void setPermAllIssueAndProjectSetting(Boolean permAllIssueAndProjectSetting) {
- this.permAllIssueAndProjectSetting = permAllIssueAndProjectSetting;
- }
-
public Boolean getPermProjectSetting() {
return permProjectSetting;
}
@@ -131,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() {
@@ -184,12 +184,12 @@
public void makePermission() {
this.permission = MngPermission.USER_PERMISSION_MNG_NONE;
- 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);
+ 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);
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 572586f..ee17883 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -110,7 +110,7 @@
common.remainIssue=\uC794\uC5EC \uC774\uC288
common.severityIssue=\uC911\uC694\uB3C4 \uBCC4 \uC774\uC288 \uD604\uD669
managementWorkspace.levelName=\uB4F1\uAE09\uBA85
-manageUser.manageAllIssueAndProjectPerm=\uC804\uCCB4 \uC774\uC288 \uD504\uB85C\uC81D\uD2B8 \uBCF4\uAE30
+manageUser.manageIssuePerm=\uC774\uC288 \uAD00\uB9AC
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 d78036d..c2a1844 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -537,8 +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_PROJECT_SETTING_PERM_YN" :
- makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permAllIssueAndProjectSetting' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>";
+ case "ISSUE_SYSTEM_SETTING_PERM_YN" :
+ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permIssueSystemSetting' 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 8ee3ce8..b509df9 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -559,9 +559,9 @@
},
"manageUser": {
"manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
- "manageAllIssueAndProjectPerm": "�쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린",
+ "manageIssuePerm": "�씠�뒋 愿�由�",
"managePartnerPerm" : "�뾽泥�/ISP/�샇�뒪�똿 愿�由�",
- "manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
+ "manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪\n 愿�由�",
"manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
"manageIssueSystemPerm": "�씠�뒋 �떆�뒪�뀥 愿�由�",
"manageUsePartnerPerm": "�뙆�듃�꼫 由ъ뒪�듃 愿�由�",
diff --git a/src/main/webapp/scripts/app/manageUser/manageUser.controller.js b/src/main/webapp/scripts/app/manageUser/manageUser.controller.js
index 2c18495..b33cf5a 100644
--- a/src/main/webapp/scripts/app/manageUser/manageUser.controller.js
+++ b/src/main/webapp/scripts/app/manageUser/manageUser.controller.js
@@ -103,6 +103,13 @@
.setHWidth("width-40-p")
.setDAlign("text-center")
.setDName("account"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
+ .setHName("manageUser.managePartnerPerm")
+ .setHWidth("width-120-p")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setDName("managePartner")
+ .setDRenderer("PARTNER_SETTING_PERM_YN"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("manageUser.manageWorkspacePerm")
.setHWidth("width-120-p")
@@ -117,12 +124,18 @@
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
.setDRenderer("PROJECT_SETTING_PERM_YN"));
$scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("manageUser.manageIssueSystemPerm")
+ .setHName("manageUser.manageIssuePerm")
.setHWidth("width-20-p")
.setDType("renderer")
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
.setDRenderer("ISSUE_SETTING_PERM_YN"));
$scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("manageUser.manageIssueSystemPerm")
+ .setHWidth("width-20-p")
+ .setDType("renderer")
+ .setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
+ .setDRenderer("ISSUE_SYSTEM_SETTING_PERM_YN"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
.setHName("manageUser.manageUserPerm")
.setHWidth("width-20-p")
.setDType("renderer")
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
index 50db5a3..81b65ed 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelAdd.controller.js
@@ -21,11 +21,11 @@
$scope.vm = {
form : {
levelName : "",
- permAllIssueAndProjectSetting : false,
permPartnerSetting : false,
permWorkSpaceSetting : false,
permProjectSetting : false,
permIssueSetting : false,
+ permIssueSystemSetting : false,
permApi : false,
permNotice : false,
permFAQ : false,
diff --git a/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
index 1860be6..103cede 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceLevelModify.controller.js
@@ -22,10 +22,10 @@
id : parameter.id,
form : {
levelName : "",
- permAllIssueAndProjectSetting : false,
permWorkSpaceSetting : false,
permProjectSetting : false,
permIssueSetting : false,
+ permIssueSystemSetting : false,
permUsePartner : false,
permApi : false,
permNotice : false,
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index bfe1afe..1d4158b 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -189,19 +189,19 @@
.setDType("renderer")
.setDRenderer("USER_LEVEL_MODIFY"));
$scope.vm.tableConfigs1.push($tableProvider.config()
- .setHName("manageUser.manageAllIssueAndProjectPerm")
+ .setHName("manageUser.manageProjectPerm")
+ .setHWidth("width-120-p")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setDName("manageProject")
+ .setDRenderer("PROJECT_SETTING_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
+ .setHName("manageUser.manageIssuePerm")
.setHWidth("width-120-p")
.setDType("renderer")
.setDAlign("text-center")
.setDName("ViewAllIssueAndProject")
- .setDRenderer("All_ISSUE_PROJECT_SETTING_PERM_YN"));
- $scope.vm.tableConfigs1.push($tableProvider.config()
- .setHName("manageUser.managePartnerPerm")
- .setHWidth("width-120-p")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDName("managePartner")
- .setDRenderer("PARTNER_SETTING_PERM_YN"));
+ .setDRenderer("ISSUE_SETTING_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageWorkspacePerm")
.setHWidth("width-120-p")
@@ -210,19 +210,19 @@
.setDName("manageWorkspace")
.setDRenderer("WORKSPACE_SETTING_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
- .setHName("manageUser.manageProjectPerm")
- .setHWidth("width-120-p")
- .setDType("renderer")
- .setDAlign("text-center")
- .setDName("manageProject")
- .setDRenderer("PROJECT_SETTING_PERM_YN"));
- $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageIssueSystemPerm")
.setHWidth("width-120-p")
.setDType("renderer")
.setDAlign("text-center")
.setDName("IssueSystem")
- .setDRenderer("ISSUE_SETTING_PERM_YN"));
+ .setDRenderer("ISSUE_SYSTEM_SETTING_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
+ .setHName("manageUser.managePartnerPerm")
+ .setHWidth("width-120-p")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setDName("managePartner")
+ .setDRenderer("PARTNER_SETTING_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageApiPerm")
.setHWidth("width-120-p")
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index e2ad463..920039d 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -241,10 +241,10 @@
$rootScope.mngPermission = {
"USER_PERMISSION_MNG_WORKSPACE" : 16384,
"USER_PERMISSION_MNG_PROJECT" : 8192,
- "USER_PERMISSION_MNG_ISSUE_PROJECT_ALL" : 4096,
+ "USER_PERMISSION_MNG_ISSUE" : 4096,
"USER_PERMISSION_MNG_PARTNER" : 2048,
"USER_PERMISSION_MNG_API" : 1024,
- "USER_PERMISSION_MNG_ISSUE_STATUS" : 512,
+ "USER_PERMISSION_MNG_ISSUE_SYSTEM" : 512,
"USER_PERMISSION_MNG_WORKFLOW" : 256,
"USER_PERMISSION_MNG_CUSTOME_FIELD" : 128,
"USER_PERMISSION_MNG_ISSUE_TYPE" : 64,
diff --git a/src/main/webapp/views/workspace/workspaceLevelAdd.html b/src/main/webapp/views/workspace/workspaceLevelAdd.html
index 51a8558..fe4b702 100644
--- a/src/main/webapp/views/workspace/workspaceLevelAdd.html
+++ b/src/main/webapp/views/workspace/workspaceLevelAdd.html
@@ -35,10 +35,18 @@
<!--tableColumnGenerator.dirextive.js �뙆�씪 李멸퀬-->
<tr>
<td class="text-left bold">
- <span translate="manageUser.manageAllIssueAndProjectPerm">�쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린</span>
+ <span translate="manageUser.manageProjectPerm">�봽濡쒖젥�듃 愿�由�</span>
</td>
<td colspan="2">
- <label class='switch'><input type='checkbox' ng-model='vm.form.permAllIssueAndProjectSetting'><span class='slider round'></span></label>
+ <label class='switch'><input type='checkbox' ng-model='vm.form.permProjectSetting'><span class='slider round'></span></label>
+ </td>
+ </tr>
+ <tr>
+ <td class="text-left bold">
+ <span translate="manageUser.manageIssuePerm">�씠�뒋 愿�由�</span>
+ </td>
+ <td colspan="2">
+ <label class='switch'><input type='checkbox' ng-model='vm.form.permIssueSetting'><span class='slider round'></span></label>
</td>
</tr>
<tr>
@@ -51,18 +59,18 @@
</tr>
<tr>
<td class="text-left bold">
- <span translate="manageUser.manageProjectPerm">�봽濡쒖젥�듃 愿�由�</span>
+ <span translate="manageUser.manageIssueSystemPerm">�씠�뒋 �떆�뒪�뀥 愿�由�</span>
</td>
- <td colspan="2">
- <label class='switch'><input type='checkbox' ng-model='vm.form.permProjectSetting'><span class='slider round'></span></label>
+ <td>
+ <label class='switch'><input type='checkbox' ng-model='vm.form.permIssueSystemSetting' ><span class='slider round'></span></label>
</td>
</tr>
<tr>
<td class="text-left bold">
- <span translate="manageUser.manageIssueSystemPerm">�씠�뒋 �떆�뒪�뀥 愿�由�</span>
+ <span translate="manageUser.managePartnerPerm">�뾽泥�/ISP/�샇�뒪�똿 愿�由�</span>
</td>
<td>
- <label class='switch'><input type='checkbox' ng-model='vm.form.permIssueSetting' ><span class='slider round'></span></label>
+ <label class='switch'><input type='checkbox' ng-model='vm.form.permPartnerSetting'><span class='slider round'></span></label>
</td>
</tr>
<tr>
--
Gitblit v1.8.0