From fb0491479b2f1155a458f9cbd65b55d9c5a62e69 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 13:06:40 +0900
Subject: [PATCH] 부서관리와 등급관리 삭제 시 충돌 버그 해결

---
 src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 1044803..e818c63 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -19,8 +19,9 @@
                 $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 = {
@@ -74,7 +75,7 @@
                     $uibModal.open({
                         templateUrl : 'views/workspace/workspaceLevelModify.html',
                         size : "md",
-                        controller : 'levelModifyController',
+                        controller : 'workspaceLevelModifyController',
                         backdrop : 'static',
                         resolve : {
                             parameter : function () {
@@ -87,7 +88,7 @@
                 }
 
                 // �궗�슜�옄 �벑湲� �궘�젣
-                function removes() {
+                function removeLevels() {
                     var removeIds = [];
                     var removePermission = true;
 
@@ -105,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;
@@ -122,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",
@@ -209,7 +210,7 @@
                         .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")
@@ -274,7 +275,7 @@
                             $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); // "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣"
                         }
                     });
                 }

--
Gitblit v1.8.0