From 0bf55ecf79413ab8eb62cff68cb489bd36af5ae1 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 금, 12 11월 2021 11:47:24 +0900 Subject: [PATCH] 사용자 등급관리 등급명, 등급권한 관련 오류 수정 --- src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js index 1b2a39b..0b327e6 100644 --- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js +++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js @@ -107,11 +107,13 @@ if (result.data.message.status === "success") { $scope.vm.page.selectedPage = currentPage + 1; + /*if(result.data.data[0].id == 1){ + result.data.data.shift(); + }*/ $scope.vm.responseData = result.data; - } else { - SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣" + SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣 } }); } @@ -139,7 +141,7 @@ $uibModal.open({ templateUrl : 'views/workspace/workspaceDepartmentModify.html', size : "md", - controller : 'departmentModifyController', + controller : 'workspaceDepartmentModifyController', backdrop : 'static', resolve : { parameter : function () { @@ -189,8 +191,8 @@ // �궘�젣 �븣由� SweetAlert.swal({ - title : $filter("translate")("customField.deleteUserDefinedFields"), // "�궗�슜�옄 �젙�쓽 �븘�뱶 �궘�젣" - text : $filter("translate")("customField.wantToDeleteSelectUserDefinedFields"), // "�꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎." + title : $filter("translate")("managementWorkspace.deleteDepartment"), // "遺��꽌 �궘�젣" + text : $filter("translate")("managementWorkspace.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎." type : "warning", showCancelButton : true, confirmButtonColor : "#DD6B55", @@ -229,7 +231,6 @@ } $scope.fn.makeTableConfigs(); - $scope.fn.getDepartmentList(); } ]); -- Gitblit v1.8.0