From 5df33661fc5d9366bd25e769e90caf0255edc95c Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 수, 03 11월 2021 14:33:58 +0900 Subject: [PATCH] - 사용자 등급관리 findByLevelId 파라미터 Name 변경 - 사용자 삭제 알림 명칭 지정 추가 --- src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js index 1274e8e..0cb8031 100644 --- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js +++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js @@ -29,7 +29,7 @@ selectedPageRowCount : String(10) }; - $scope.vm.tableConfigs = []; + $scope.vm.tableConfigs2 = []; $scope.vm.responseData = { data : [] }; @@ -37,7 +37,6 @@ // �뀒�씠釉� �씠踰ㅽ듃 $scope.vm.tableEvent = { // modifyUserWorkspace : modifyUserWorkspace // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃� - view : view }; // 遺��꽌 愿�由� 由ъ뒪�듃 遺덈윭�삤湲� @@ -52,23 +51,23 @@ // 遺��꽌 愿�由� �뀒�씠釉� �꽕�젙 function makeTableConfigs() { - $scope.vm.tableConfigs = []; + $scope.vm.tableConfigs2 = []; - $scope.vm.tableConfigs.push($tableProvider.config() + $scope.vm.tableConfigs2.push($tableProvider.config() .setDType("checkbox") .setHWidth("width-20-p") .setDAlign("text-center")); - $scope.vm.tableConfigs.push($tableProvider.config() + $scope.vm.tableConfigs2.push($tableProvider.config() .setHName("manageDepartment.departmentName") .setHWidth("width-120-p") .setDAlign("text-center") .setDName("levelName")); - $scope.vm.tableConfigs.push($tableProvider.config() + $scope.vm.tableConfigs2.push($tableProvider.config() .setHName("manageDepartment.departmentEx") .setHWidth("width-120-p") .setDAlign("text-center") .setDName("manageProject")); - $scope.vm.tableConfigs.push($tableProvider.config() + $scope.vm.tableConfigs2.push($tableProvider.config() .setHName("manageDepartment.departmentCount") .setHWidth("width-120-p") .setDAlign("text-center") @@ -96,18 +95,17 @@ }; //�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥� - //UserWorkspace.findDepartment($resourceProvider.getContent(conditions, - UserWorkspace.departmentFind($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; - } - else { - SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣" - } - }); + // UserWorkspace.departmentFind($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; + // } + // else { + // SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣" + // } + // }); } // 遺��꽌 異붽� function departmentAdd() { -- Gitblit v1.8.0