From d78323a9138aab73f9f1b25e0a74283780176452 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 09 12월 2021 20:43:47 +0900
Subject: [PATCH] - 이슈전체보기/이슈프로젝트보기 권한 생성 - 워크스페이스 권한을 가진 사용자 OWL정보 오류 해결
---
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 115 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 12fae15..f3cd142 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -9,16 +9,19 @@
],
function (app, angular) {
app.controller('workspaceUserLevelController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$q', '$state', '$tableProvider', 'Payment', 'Workspace',
- 'UserWorkspace', '$filter',
- function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $q, $state, $tableProvider, Payment, Workspace, UserWorkspace, $filter) {
+ 'UserWorkspace', '$filter','$timeout',
+ function ($scope, $rootScope, $log, $resourceProvider, SweetAlert, $uibModal, $q, $state, $tableProvider, Payment, Workspace, UserWorkspace, $filter, $timeout) {
/* $scope.fn �긽�냽 以� */
$scope.fn.getUserLevelList = getUserLevelList; // �궗�슜�옄 �벑湲� 愿�由� 由ъ뒪�듃
$scope.fn.makeTableConfigs = makeTableConfigs; // �궗�슜�옄 �벑湲� 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
- $scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
+ $scope.fn.initSearchUserLevel = initSearchUserLevel; // 寃��깋 議곌굔 珥덇린�솕
+ $scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
$scope.fn.levelAdd = levelAdd; // �벑湲� 異붽�
- $scope.fn.removes = removes; // �궗�슜�옄 �벑湲� �궘�젣
+ $scope.fn.removeLevels = removeLevels; // �궗�슜�옄 �벑湲� �궘�젣
+ $scope.fn.makeSearchConditions = makeSearchConditions;
+
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -37,17 +40,55 @@
};
// �뀒�씠釉� �씠踰ㅽ듃
- $scope.vm.tableEvent = {
- // modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ $scope.tableEvent1 = {
+ modifyLevelPermission : modifyLevelPermission, // 沅뚰븳 蹂�寃�
+ modifyLevel : modifyLevel // �궗�슜�옄 �벑湲됰챸 蹂�寃�
};
+
+ function modifyLevelPermission(userPermission) {
+ UserWorkspace.modifyLevelPermission($resourceProvider.getContent(
+ userPermission,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+ if (result.data.message.status === "success") {
+
+ }
+ else {
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToParticipationStatusChange"), result.data.message.message); // "沅뚰븳 蹂�寃� �떎�뙣"
+ }
+ });
+ }
// �궗�슜�옄 �벑湲� 由ъ뒪�듃 遺덈윭�삤湲�
$scope.$on("getUserLevelList", function () {
$scope.fn.getUserLevelList(0);
});
+ function makeSearchConditions() {
+ var conditions = {
+ levelName: $scope.vm.search.levelName
+ }
+ return conditions;
+ }
+
+ // �궗�슜�옄 �벑湲� �닔�젙
+ function modifyLevel(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceLevelModify.html',
+ size : "md",
+ controller : 'workspaceLevelModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id
+ };
+ }
+ }
+ });
+ }
+
// �궗�슜�옄 �벑湲� �궘�젣
- function removes() {
+ function removeLevels() {
var removeIds = [];
var removePermission = true;
@@ -65,7 +106,7 @@
SweetAlert.swal({
html : true,
title : $filter("translate")("common.deleteFailed"), // �궘�젣 �떎�뙣
- text : $filter("translate")("issue.notHaveDeletePermissionExistsAnIssue"), // �궘�젣 沅뚰븳�씠 �뾾�뒗 �씠�뒋媛� 議댁옱�빀�땲�떎.
+ text : $filter("translate")("managementWorkspace.notHaveDeletePermissionExistsAnLevel"), // �궘�젣 沅뚰븳�씠 �뾾�뒗 �벑湲됱씠 議댁옱 �빀�땲�떎.
type : "error"
});
return;
@@ -82,8 +123,8 @@
// �궘�젣 �븣由�
SweetAlert.swal({
- title : $filter("translate")("issue.deleteIssue"), // �씠�뒋 �궘�젣
- text : $filter("translate")("issue.wantToDeleteSelectIssue"), // �꽑�깮�븳 �씠�뒋�쓣 �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �씠�뒋�� 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.
+ title : $filter("translate")("managementWorkspace.deleteLevel"), // �벑湲� �궘�젣
+ text : $filter("translate")("managementWorkspace.wantToDeleteSelectLevel"), // �꽑�깮�븳 �벑湲됱쓣 �궘�젣�븯寃좎뒿�땲源�? �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �벑湲됱� �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.
type : "warning",
showCancelButton : true,
confirmButtonColor : "#DD6B55",
@@ -107,9 +148,7 @@
SweetAlert.success($filter("translate")("common.deleteSucceeded"), result.data.message.message); // �궘�젣 �꽦怨�
}, 100);
- $scope.fn.listView();
-
- $scope.fn.getPageList(0);
+ $scope.fn.getUserLevelList(0);
}
else {
$timeout(function () {
@@ -125,11 +164,14 @@
// 寃��깋 議곌굔 珥덇린�솕
- function initSearch() {
- //$scope.vm.search.name = "";
- //$scope.vm.search.account = "";
- //$scope.vm.search.statuses = [];
- $scope.fn.getUserWorkspaceList(0);
+ function initSearchUserLevel() {
+ $scope.vm.search.levelName = "";
+ $scope.fn.getUserLevelList(0);
+ }
+
+ // �벑湲� 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
+ function changePageRowCount() {
+ $scope.fn.getUserLevelList(0);
}
// �궗�슜�옄 �벑湲� 愿�由� �뀒�씠釉� �꽕�젙
@@ -144,14 +186,36 @@
.setHName("managementWorkspace.levelName")
.setHWidth("width-120-p")
.setDAlign("text-center")
- .setDName("levelName"));
+ .setDType("renderer")
+ .setDRenderer("USER_LEVEL_MODIFY"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
+ .setHName("manageUser.manageAllIssuePerm")
+ .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"));
+ $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.manageWorkspacePerm")
.setHWidth("width-120-p")
.setDType("renderer")
.setDAlign("text-center")
- .setDName("manageProject")
- .setDRenderer("WORKSPACE_USE_YN"));
+ .setDName("manageWorkspace")
+ .setDRenderer("WORKSPACE_SETTING_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageProjectPerm")
.setHWidth("width-120-p")
@@ -167,12 +231,12 @@
.setDName("IssueSystem")
.setDRenderer("ISSUE_SETTING_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
- .setHName("manageUser.manageUserPerm")
+ .setHName("manageUser.manageApiPerm")
.setHWidth("width-120-p")
.setDType("renderer")
.setDAlign("text-center")
.setDName("User")
- .setDRenderer("USER_PERM_YN"));
+ .setDRenderer("API_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageNoticePerm")
.setHWidth("width-140-p")
@@ -220,7 +284,7 @@
}
var conditions = {
- name : $scope.vm.search.levelName //�벑湲됰챸
+ levelName : $scope.vm.search.levelName //�벑湲됰챸
};
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
@@ -232,10 +296,11 @@
$scope.vm.responseData = result.data;
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣"
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullLevelList"), result.data.message.message); // "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣"
}
});
}
+
// �벑湲� 異붽�
function levelAdd() {
$uibModal.open({
--
Gitblit v1.8.0