From 524dc660327c6cdd6eb20ef5d2feb4afd9c3db00 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 08 11월 2021 09:37:04 +0900 Subject: [PATCH] 오류 메시지 수정 및 버그 수정 --- src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js index 1c6cfd5..9da25a4 100644 --- a/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js +++ b/src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js @@ -36,7 +36,6 @@ fieldValue : $filter("translate")("managementWorkspace.participation") // "李몄뿬" }, { fieldKey : "N", - //fieldValue : $filter("translate")("managementWorkspace.waitForParticipation") // "李몄뿬��湲�" fieldValue : $filter("translate")("managementWorkspace.withdrawal") // "�깉�눜" }] }; @@ -230,12 +229,18 @@ var idx = 0; angular.forEach($scope.vm.responseData.data, function (data) { // data.levelId = $scope.vm.levels[idx].fieldKey; + //data.department = $scope.vm.departments[idx]; + data.levels = []; data.departments = []; data.levels = $scope.vm.levels.slice(); data.departments = $scope.vm.departments.slice(); idx++; }); + /*if(result.data.data[idx-1].departmentId == 0){ + //console.log($scope.vm.tableConfigs); + //result.data.data[idx-1].department.fieldValue = '遺��꽌瑜� �꽑�깮 �븯�꽭�슂.'; + }*/ } else { SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣" @@ -260,7 +265,7 @@ }); } else { - SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣 + SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullLevelList"), result.data.message.message, "error"); // �슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣 } deferred.resolve(result.data.data); @@ -286,7 +291,7 @@ }); } else { - SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message, "error"); // �뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣 + SweetAlert.swal($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message, "error"); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣 } deferred.resolve(result.data.data); -- Gitblit v1.8.0