From ac6bcb6bff012f660f27968e511f394383759000 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 03 11월 2021 16:36:18 +0900
Subject: [PATCH] - 관리자 가져오는 함수 수정 => 기존 : 퍼미션이 2046인 사용자를 가져옴 => 수정 : 퍼미션을 파라미터로 입력한 사용자를 가져옴
---
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 190 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 170 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index f78008e..fb39d05 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -9,8 +9,8 @@
],
function (app, angular) {
app.controller('workspaceUserLevelController', ['$scope', '$rootScope', '$log', '$resourceProvider', 'SweetAlert', '$uibModal', '$q', '$state', '$tableProvider', 'Payment', 'Workspace',
- 'UserWorkspace', 'Workspace', '$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 �긽�냽 以� */
@@ -18,6 +18,9 @@
$scope.fn.makeTableConfigs = makeTableConfigs; // �궗�슜�옄 �벑湲� 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearch = initSearch; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.levelAdd = levelAdd; // �벑湲� 異붽�
+ $scope.fn.removes = removes; // �궗�슜�옄 �벑湲� �궘�젣
+ $scope.fn.getPageList = getPageList; // 紐⑸줉 議고쉶
+ $scope.fn.listView = listView; // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃�
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -30,7 +33,7 @@
selectedPageRowCount : String(10)
};
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs1 = [];
$scope.vm.responseData = {
data : []
};
@@ -45,6 +48,143 @@
$scope.fn.getUserLevelList(0);
});
+ // �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
+ function getPageList(selectedPage, detail = false) {
+ if (selectedPage < 0) {
+ selectedPage = 0;
+ }
+ // �쁽�옱 �럹�씠吏� �젙蹂�
+ 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); // �씠�뒋 議고쉶 �떎�뙣
+ }
+ });
+ }
+
+ // 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
+ 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 removes() {
+ var removeIds = [];
+ var removePermission = true;
+
+ angular.forEach($scope.vm.responseData.data, function (data) {
+ if (data.checked && data.modifyPermissionCheck) {
+ removeIds.push(data.id);
+ }
+
+ if (data.checked && !data.modifyPermissionCheck) {
+ removePermission = false;
+ }
+ });
+
+ if (!removePermission) {
+ SweetAlert.swal({
+ html : true,
+ title : $filter("translate")("common.deleteFailed"), // �궘�젣 �떎�뙣
+ text : $filter("translate")("issue.notHaveDeletePermissionExistsAnIssue"), // �궘�젣 沅뚰븳�씠 �뾾�뒗 �씠�뒋媛� 議댁옱�빀�땲�떎.
+ type : "error"
+ });
+ return;
+ }
+
+ if (removeIds.length < 1) {
+ SweetAlert.swal({
+ title : $filter("translate")("common.checkPurgingTargets"), // �궘�젣 ���긽 �솗�씤
+ text : $filter("translate")("common.selectDestinationDeletion"), // �궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.
+ type : "warning"
+ });
+ return;
+ }
+
+ // �궘�젣 �븣由�
+ SweetAlert.swal({
+ title : $filter("translate")("issue.deleteIssue"), // �씠�뒋 �궘�젣
+ text : $filter("translate")("issue.wantToDeleteSelectIssue"), // �꽑�깮�븳 �씠�뒋�쓣 �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �씠�뒋�� 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.
+ type : "warning",
+ showCancelButton : true,
+ confirmButtonColor : "#DD6B55",
+ confirmButtonText : $filter("translate")("common.delete"), // �궘�젣
+ cancelButtonText : $filter("translate")("common.cancel"), // 痍⑥냼
+ closeOnConfirm : false,
+ closeOnCancel : true
+ },
+ function (isConfirm) {
+ SweetAlert.close();
+
+ if (isConfirm) {
+ $rootScope.spinner = true;
+
+ UserWorkspace.levelRemove($resourceProvider.getContent(
+ { removeIds : removeIds },
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $timeout(function () {
+ SweetAlert.success($filter("translate")("common.deleteSucceeded"), result.data.message.message); // �궘�젣 �꽦怨�
+ }, 100);
+
+ $scope.fn.listView();
+
+ $scope.fn.getPageList(0);
+ }
+ else {
+ $timeout(function () {
+ SweetAlert.error($filter("translate")("common.deleteFailed"), result.data.message.message); // �궘�젣 �떎�뙣
+ }, 100);
+ }
+
+ $rootScope.spinner = false;
+ });
+ }
+ });
+ }
+
+
// 寃��깋 議곌굔 珥덇린�솕
function initSearch() {
//$scope.vm.search.name = "";
@@ -55,63 +195,73 @@
// �궗�슜�옄 �벑湲� 愿�由� �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
- $scope.vm.tableConfigs = [];
+ $scope.vm.tableConfigs1 = [];
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setDType("checkbox")
.setHWidth("width-20-p")
.setDAlign("text-center"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("managementWorkspace.levelName")
.setHWidth("width-120-p")
.setDAlign("text-center")
.setDName("levelName"));
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("manageUser.manageProjectPerm")
+ $scope.vm.tableConfigs1.push($tableProvider.config()
+ .setHName("manageUser.manageWorkspacePerm")
.setHWidth("width-120-p")
+ .setDType("renderer")
.setDAlign("text-center")
.setDName("manageProject")
.setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ $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("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("ISSUE_SETTING_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageUserPerm")
.setHWidth("width-120-p")
+ .setDType("renderer")
.setDAlign("text-center")
.setDName("User")
- .setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("USER_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageNoticePerm")
.setHWidth("width-140-p")
.setDType("renderer")
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
.setDName("Notice")
- .setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("NOTICE_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageFAQPerm")
.setHWidth("width-140-p")
.setDType("renderer")
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
.setDName("FAQ")
- .setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("FAQ_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageQnAPerm")
.setHWidth("width-140-p")
.setDType("renderer")
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
.setDName("QnA")
- .setDRenderer("WORKSPACE_USE_YN"));
- $scope.vm.tableConfigs.push($tableProvider.config()
+ .setDRenderer("QNA_PERM_YN"));
+ $scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageGuidePerm")
.setHWidth("width-140-p")
.setDType("renderer")
.setDAlign("text-center pdr0 pdt0 pdl0 pdb0")
.setDName("Guide")
- .setDRenderer("WORKSPACE_USE_YN"));
+ .setDRenderer("GUIDE_PERM_YN"));
}
// �궗�슜�옄 �벑湲� 愿�由� 紐⑸줉 議고쉶
--
Gitblit v1.8.0