From 8e538d93ca3f8da8d082ad2ee497625349d9a4dd Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 05 11월 2021 17:00:19 +0900
Subject: [PATCH] 부서관리 백엔드 수정
---
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 129 ++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 73 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index fb39d05..40855c9 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -16,11 +16,12 @@
/* $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.getPageList = getPageList; // 紐⑸줉 議고쉶
- $scope.fn.listView = listView; // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃�
+ $scope.fn.makeSearchConditions = makeSearchConditions;
+
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -39,72 +40,51 @@
};
// �뀒�씠釉� �씠踰ㅽ듃
- $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 getPageList(selectedPage, detail = false) {
- if (selectedPage < 0) {
- selectedPage = 0;
+ function makeSearchConditions() {
+ var conditions = {
+ levelName: $scope.vm.search.levelName
}
- // �쁽�옱 �럹�씠吏� �젙蹂�
- var currentPage = 0;
-
- // 荑좏궎�뿉 �꽑�깮�븳 �럹�씠吏� �젙蹂닿� �뾾�쑝硫� 湲곕낯 �럹�씠吏� �젙蹂� 0 �쓣 ���옣
- if (angular.isUndefined(selectedPage) || selectedPage === "") {
- currentPage = $scope.vm.page.selectedPage;
- }
- else {
- currentPage = selectedPage;
- }
-
-
- // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
- //$scope.fn.makeVmSearchObject();
-
-
- // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
- if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
- var find = findProjectSearch($rootScope.workProject.id);
- if (!find) {
- $scope.vm.projects.push($rootScope.workProject);
- }
- }
-
- // �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
- var conditions = $scope.fn.makeSearchConditions();
-
- Issue.find($resourceProvider.getContent(conditions,
- $resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
-
- if (result.data.message.status === "success") {
- $scope.vm.page.selectedPage = currentPage + 1;
- $scope.vm.responseData = result.data;
- if (detail) {
- changeDetailView(result.data.data[0].id);
- }
- }
- else {
- SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
- }
- });
+ return conditions;
}
- // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
- function listView() {
- $scope.vm.detailView = false;
- // �씠�뒋 �뀒�씠釉� �꽕�젙
- $scope.fn.makeTableConfigs();
- var temp = angular.copy($scope.vm.responseData.data);
- $scope.vm.responseData.data = angular.copy(temp);
- // 留덉�留됱쑝濡� 蹂닿퀬�엳�뜕 �씠�뒋 id瑜� 珥덇린�솕�븳�떎.
- $rootScope.currentDetailIssueId = null;
+ // �궗�슜�옄 �벑湲� �닔�젙
+ function modifyLevel(id) {
+ $uibModal.open({
+ templateUrl : 'views/workspace/workspaceLevelModify.html',
+ size : "md",
+ controller : 'levelModifyController',
+ backdrop : 'static',
+ resolve : {
+ parameter : function () {
+ return {
+ id : id
+ };
+ }
+ }
+ });
}
// �궗�슜�옄 �벑湲� �궘�젣
@@ -168,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 () {
@@ -186,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);
}
// �궗�슜�옄 �벑湲� 愿�由� �뀒�씠釉� �꽕�젙
@@ -205,14 +186,15 @@
.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.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")
@@ -228,12 +210,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")
@@ -281,7 +263,7 @@
}
var conditions = {
- name : $scope.vm.search.levelName //�벑湲됰챸
+ levelName : $scope.vm.search.levelName //�벑湲됰챸
};
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
@@ -297,6 +279,7 @@
}
});
}
+
// �벑湲� 異붽�
function levelAdd() {
$uibModal.open({
--
Gitblit v1.8.0