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/workspaceUserLevelConfig.controller.js | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 26d43b3..154ae90 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -20,6 +20,8 @@
$scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
$scope.fn.levelAdd = levelAdd; // �벑湲� 異붽�
$scope.fn.removes = removes; // �궗�슜�옄 �벑湲� �궘�젣
+ $scope.fn.makeSearchConditions = makeSearchConditions;
+
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -39,13 +41,34 @@
// �뀒�씠釉� �씠踰ㅽ듃
$scope.tableEvent1 = {
- modifyLevel : modifyLevel // �뾽臾� 怨듦컙 李몄뿬�븯�뒗 �궗�슜�옄�쓽 李몄뿬 �긽�깭 蹂�寃�
+ modifyLevelPermission : modifyLevelPermission, // 沅뚰븳 蹂�寃�
+ modifyLevel : modifyLevel // �궗�슜�옄 �벑湲됰챸 蹂�寃�
};
+
+ function modifyLevelPermission(userPermission) {
+ UserWorkspace.modifyLevelPermission($resourceProvider.getContent(
+ userPermission,
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+ if (result.data.message.status === "success") {
+
+ }
+ else {
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToParticipationStatusChange"), result.data.message.message); // "沅뚰븳 蹂�寃� �떎�뙣"
+ }
+ });
+ }
// �궗�슜�옄 �벑湲� 由ъ뒪�듃 遺덈윭�삤湲�
$scope.$on("getUserLevelList", function () {
$scope.fn.getUserLevelList(0);
});
+
+ function makeSearchConditions() {
+ var conditions = {
+ levelName: $scope.vm.search.levelName
+ }
+ return conditions;
+ }
// �궗�슜�옄 �벑湲� �닔�젙
function modifyLevel(id) {
@@ -83,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;
@@ -100,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",
@@ -187,12 +210,12 @@
.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")
.setDName("User")
- .setDRenderer("USER_PERM_YN"));
+ .setDRenderer("API_PERM_YN"));
$scope.vm.tableConfigs1.push($tableProvider.config()
.setHName("manageUser.manageNoticePerm")
.setHWidth("width-140-p")
@@ -252,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