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/views/workspace/workspaceUserLevelConfig.html | 4
src/main/webapp/scripts/app/workspace/workspaceUserConfig.controller.js | 11 ++-
src/main/webapp/views/workspace/workspaceUserConfig.html | 16 -----
src/main/webapp/scripts/app/workspace/levelModify.controller.js | 2
src/main/webapp/i18n/ko/global.json | 33 ++++++----
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 8 ++
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 6 +-
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 8 +-
src/main/webapp/views/workspace/workspaceDepartmentConfig.html | 74 ------------------------
9 files changed, 46 insertions(+), 116 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 76eb9f0..4b63fd6 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -347,7 +347,13 @@
break;
case "DEPARTMENT_OPTION" :
- makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ //if (scope.data.departmentId != null){
+ makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ //}
+ //else{
+ // makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option>遺��꽌瑜� �꽑�깮 �븯�꽭�슂.</option>"
+ // makeTag +="<option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>";
+ //}
break;
case "LEVEL_OPTION" :
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index c958e81..9963c86 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -67,6 +67,11 @@
"levelName" : "�벑湲됰챸",
"failedLevelRegistration" : "�궗�슜�옄 �벑湲� �벑濡� �떎�뙣",
"failedDepartmentRegistration" : "遺��꽌 �벑濡� �떎�뙣",
+ "notHaveDeletePermissionExistsAnLevel" : "�궘�젣 沅뚰븳�씠 �뾾�뒗 �벑湲됱씠 議댁옱 �빀�땲�떎.",
+ "wantToDeleteSelectLevel": "�꽑�깮�븳 �벑湲됱쓣 �궘�젣�븯寃좎뒿�땲源�? \n �궘�젣�맂 �벑湲됱� 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+ "wantToDeleteSelectDepartment": "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+ "deleteDepartment": "遺��꽌 �궘�젣",
+ "deleteLevel": "�벑湲� �궘�젣",
"read" : "�씫湲�",
"write" : "�벐湲�",
"departmentManagement" : "遺��꽌 愿�由�",
@@ -140,7 +145,7 @@
"failedToRegularPaymentChange": "�젙湲� 寃곗젣 蹂�寃� �떎�뙣",
"failedToParticipationStatusChange": "李몄뿬 �긽�깭 蹂�寃� �떎�뙣",
"failedToSelectWorkspaceFullUserList": "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣",
- "failedToSelectWorkspaceFullUserLevelList": "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣",
+ "failedToSelectWorkspaceFullLevelList": "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣",
"failedToSelectWorkspaceFullDepartmentList": "遺��꽌 紐⑸줉 議고쉶 �떎�뙣",
"failedToModifyUserLevel": "�궗�슜�옄 �벑湲� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
},
@@ -159,13 +164,13 @@
"relationIssueSelect": "�뿰愿� �씠�뒋 �꽑�깮",
"relationIssueDelete" : "�궘�젣",
"relationIssueRemove" : "�뿰愿� �씠�뒋 �궘�젣",
- "relationIssueRemoveHistory" : "�뿰愿� �씠�뒋�씠 �궘�젣�릺�뿀�뒿�땲�떎.",
- "relationIssueAddHistory" : "�뿰愿� �씠�뒋�씠 異붽��릺�뿀�뒿�땲�떎.",
+ "relationIssueRemoveHistory" : "�뿰愿� �씠�뒋媛� �궘�젣�릺�뿀�뒿�땲�떎.",
+ "relationIssueAddHistory" : "�뿰愿� �씠�뒋媛� 異붽��릺�뿀�뒿�땲�떎.",
"requireIssueTitle": "�씠�뒋 �젣紐⑹쓣 �엯�젰�븯�꽭�슂.",
"issueList": "�씠�뒋 紐⑸줉",
"summaryIssueActivity": "�씠�뒋 �솢�룞 �궡�뿭 �슂�빟",
"modifyIssues": "�씠�뒋 �닔�젙",
- "continueCreateIssue": "�씠 �솕硫댁뿉�꽌 �씠�뒋�쓣 怨꾩냽 �깮�꽦�빀�땲�떎.",
+ "continueCreateIssue": "�씠 �솕硫댁뿉�꽌 �씠�뒋瑜� 怨꾩냽 �깮�꽦�빀�땲�떎.",
"initializedAssigneeCustomField": "�봽濡쒖젥�듃瑜� 蹂�寃쏀븯硫� �떞�떦�옄, �궗�슜�옄 �젙�쓽 �븘�뱶 媛믪씠 珥덇린�솕 �맗�땲�떎.",
"setUpUsersParticipatingInProject": "�봽濡쒖젥�듃�뿉 李몄뿬�븯�뒗 �궗�슜�옄瑜� �꽕�젙�빀�땲�떎.",
"initializedIssueStatus": "�씠�뒋 �쑀�삎�쓣 蹂�寃쏀븷 寃쎌슦 �궗�슜�옄 �젙�쓽 �븘�뱶, �씠�뒋 �긽�깭媛� 珥덇린�솕 �맗�땲�떎.",
@@ -179,14 +184,14 @@
"selectProjectAndIssueTypeDownloadExcel": "�봽濡쒖젥�듃, �씠�뒋 �쑀�삎�쓣 �꽑�깮�븯硫� �빐�떦 �븯�뒗 �뼇�떇�쓽 �뿊���쓣 �떎�슫濡쒕뱶 �븷 �닔 �엳�뒿�땲�떎.",
"settingTableDisplay": "�뀒�씠釉� �몴�떆 �꽕�젙",
"deleteIssue": "�씠�뒋 �궘�젣",
- "wantToDeleteSelectIssue": "�꽑�깮�븳 �씠�뒋�쓣 �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�� �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
- "wantToDeleteSelectRelationIssue": "�꽑�깮�븳 �뿰愿� �씠�뒋�쓣 �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �뿰愿� �씠�뒋�� 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
+ "wantToDeleteSelectIssue": "�꽑�깮�븳 �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
+ "wantToDeleteSelectRelationIssue": "�꽑�깮�븳 �뿰愿� �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �뿰愿� �씠�뒋�뒗 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
"failedToSaveFieldConditions": "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣",
"failedToGetSearchFieldCondition": "寃��깋 �븘�뱶 議곌굔 媛��졇�삤湲� �떎�뙣",
"failedIssueLookup": "�씠�뒋 議고쉶 �떎�뙣",
"selectionCheck": "�꽑�깮 ���긽 �솗�씤",
- "selectIssueToChangeStatus": "�긽�깭 蹂�寃쏀븷 �씠�뒋�쓣 �꽑�깮�븯�꽭�슂.",
- "notHaveDeletePermissionExistsAnIssue": "�궘�젣 沅뚰븳�씠 �뾾�뒗 �씠�뒋�씠 議댁옱�빀�땲�떎.",
+ "selectIssueToChangeStatus": "�긽�깭 蹂�寃쏀븷 �씠�뒋瑜� �꽑�깮�븯�꽭�슂.",
+ "notHaveDeletePermissionExistsAnIssue": "�궘�젣 沅뚰븳�씠 �뾾�뒗 �씠�뒋媛� 議댁옱�빀�땲�떎.",
"failedToIssueTypeListLookup": "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣",
"failedToPriorityListLookup": "�슦�꽑�닚�쐞 紐⑸줉 議고쉶 �떎�뙣",
"failedToCriticalListLookup": "以묒슂�룄 紐⑸줉 議고쉶 �떎�뙣",
@@ -194,7 +199,7 @@
"failedToIssueTableColumnLookup": "�씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣",
"failedToIssueAddIssueRelation": "�뿰愿� �씠�뒋 異붽� �떎�뙣",
"failedToIssueDeleteIssueRelation": "�뿰愿� �씠�뒋 �궘�젣 �떎�뙣",
- "errorSelectRelationIssue" : "�뿰愿� �씠�뒋�씠 �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.",
+ "errorSelectRelationIssue" : "�뿰愿� �씠�뒋媛� �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.",
"capacityExceededImageFile": "�씠誘몄� �뙆�씪 �슜�웾 珥덇낵",
"attachedOnlyImageFiles10mb": "30MB �씠�븯�쓽 �씠誘몄� �뙆�씪留� 泥⑤�媛� 媛��뒫�빀�땲�떎.",
"attachedMultipleImageFiles100mb": "�뿬�윭 嫄댁쓽 �씠誘몄�瑜� �븳踰덉뿉 泥⑤��븷 寃쎌슦 300MB �씠�븯源뚯�留� 泥⑤�媛� 媛��뒫�빀�땲�떎.",
@@ -244,7 +249,7 @@
"changedUser": "蹂�寃� �궗�슜�옄",
"issueReservation": "�씠�뒋 諛쒖깮 �삁�빟",
"issueReservationType": "�씠�뒋 諛쒖깮 �쑀�삎",
- "issueReservationDescription": "�씠�뒋�쓣 �듅�젙�씪�뿉 �떎�떆 諛쒖깮�떆�궗 �닔 �엳�뒿�땲�떎. <br />諛섎났�쟻�쑝濡� �닔�뻾�빐�빞 �븷 �씠�뒋�씠 �엳�쓣 �븣 �쑀�슜�븯寃� �궗�슜�븷 �닔 �엳�뒿�땲�떎.",
+ "issueReservationDescription": "�씠�뒋瑜� �듅�젙�씪�뿉 �떎�떆 諛쒖깮�떆�궗 �닔 �엳�뒿�땲�떎. <br />諛섎났�쟻�쑝濡� �닔�뻾�빐�빞 �븷 �씠�뒋媛� �엳�쓣 �븣 �쑀�슜�븯寃� �궗�슜�븷 �닔 �엳�뒿�땲�떎.",
"everyDay": "留ㅼ씪",
"everyWeek": "留ㅼ＜",
"everyMonth": "留ㅼ썡",
@@ -277,12 +282,12 @@
"sentToTheSelectedUser": "�꽑�깮�븳 �궗�슜�옄�뿉寃� �씠硫붿씪�씠 諛쒖넚�릺�뿀�뒿�땲�떎.",
"failedIssueMail": "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣",
"issueVersionLookupFailed": "�씠�뒋 踰꾩쟾 議고쉶 �떎�뙣",
- "relationIssueType1" : "�떎�쓬 �씠�뒋怨� 愿��젴�맖",
+ "relationIssueType1" : "�떎�쓬 �씠�뒋�� 愿��젴�맖",
"relationIssueType2" : "�떎�쓬 �씠�뒋�뿉 以묐났�맖",
"relationIssueType3" : "�떎�쓬 �씠�뒋�쓽 �빐寃곗쓣 留됯퀬 �엳�쓬",
"relationIssueType4" : "�떎�쓬 �씠�뒋�뿉寃� 留됲��엳�쓬",
"relationIssueType5" : "�떎�쓬�뿉 吏꾪뻾�븷 �씠�뒋",
- "relationIssueType6" : "�떎�쓬 �씠�뒋�쓣 �슦�꽑 吏꾪뻾",
+ "relationIssueType6" : "�떎�쓬 �씠�뒋瑜� �슦�꽑 吏꾪뻾",
"updateIssueUser" : "�씠�뒋 �떞�떦�옄 蹂�寃�",
"normalList" : "�씠�뒋 紐⑸줉",
"timeLine" : "���엫 �씪�씤"
@@ -360,7 +365,7 @@
"failedToModifyWorkflow": "�썙�겕�뵆濡쒖슦 �닔�젙 �떎�뙣",
"failedToWorkflowDetails": "�썙�겕�뵆濡쒖슦 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
"failedToPutIssueStatus": "�씠�뒋 �긽�깭 �꽔湲� �떎�뙣",
- "onlyOneInTheWorkflow": "�썙�겕�뵆濡쒖슦�뿉�뒗 �긽�깭 �냽�꽦 '��湲�'�씤 �씠�뒋�� 1媛쒕쭔 議댁옱�빐�빞 �빀�땲�떎.",
+ "onlyOneInTheWorkflow": "�썙�겕�뵆濡쒖슦�뿉�뒗 �긽�깭 �냽�꽦 '��湲�'�씤 �씠�뒋�뒗 1媛쒕쭔 議댁옱�빐�빞 �빀�땲�떎.",
"removeMetastaticLine": "�쟾�씠�꽑 �젣嫄�",
"removeIssueStatus": "�씠�뒋 �긽�깭 �젣嫄�",
"limitNameToSpecialCharacters": "�썙�겕�뵆濡쒖슦 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.",
@@ -407,7 +412,7 @@
"typeName": "�쑀�삎 �씠由�",
"modifyType": "�쑀�삎 �닔�젙",
"template": "�뀥�뵆由�",
- "registerAnIssueTemplate": "�뀥�뵆由우쓣 誘몃━ �옉�꽦�븯�뿬 �씠�뒋�쓣 �벑濡앺븷 �븣 �궡�슜 �븘�뱶�뿉 �궗�슜�븷 �닔 �엳�뒿�땲�떎.",
+ "registerAnIssueTemplate": "�뀥�뵆由우쓣 誘몃━ �옉�꽦�븯�뿬 �씠�뒋瑜� �벑濡앺븷 �븣 �궡�슜 �븘�뱶�뿉 �궗�슜�븷 �닔 �엳�뒿�땲�떎.",
"updateWorkflowIssueStatusStandby": "�썙�겕�뵆濡쒖슦瑜� 蹂�寃쏀븷 寃쎌슦 蹂�寃쏀븯�젮�뒗 �썙�겕�뵆濡쒖슦�뿉 �긽�깭媛� 議댁옱�븯吏� �븡�쑝硫� �씠�뒋�쓽 �긽�깭媛� �긽�깭 �냽�꽦 '��湲�' �씤 �긽�깭濡� 蹂�寃쎈맗�땲�떎.",
"notHaveDeletePermissionExistsIssueType": "�궘�젣 沅뚰븳�씠 �뾾�뒗 �씠�뒋 �쑀�삎�씠 議댁옱�빀�땲�떎.",
"deleteIssueType": "�씠�뒋 �쑀�삎 �궘�젣",
diff --git a/src/main/webapp/scripts/app/workspace/levelModify.controller.js b/src/main/webapp/scripts/app/workspace/levelModify.controller.js
index 94815ed..edd2710 100644
--- a/src/main/webapp/scripts/app/workspace/levelModify.controller.js
+++ b/src/main/webapp/scripts/app/workspace/levelModify.controller.js
@@ -49,7 +49,7 @@
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserLevelList"), result.data.message.message); // "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣"
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullLevelList"), result.data.message.message); // "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣"
}
});
}
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 1b2a39b..669b824 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -111,7 +111,7 @@
}
else {
- SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullUserList"), result.data.message.message); // "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
+ SweetAlert.error($filter("translate")("managementWorkspace.failedToSelectWorkspaceFullDepartmentList"), result.data.message.message); // 遺��꽌 紐⑸줉 議고쉶 �떎�뙣
}
});
}
@@ -189,8 +189,8 @@
// �궘�젣 �븣由�
SweetAlert.swal({
- title : $filter("translate")("customField.deleteUserDefinedFields"), // "�궗�슜�옄 �젙�쓽 �븘�뱶 �궘�젣"
- text : $filter("translate")("customField.wantToDeleteSelectUserDefinedFields"), // "�꽑�깮�븳 �궗�슜�옄 �젙�쓽 �븘�뱶瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
+ title : $filter("translate")("managementWorkspace.deleteDepartment"), // "遺��꽌 �궘�젣"
+ text : $filter("translate")("customField.wantToDeleteSelectDepartment"), // "�꽑�깮�븳 遺��꽌瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 遺��꽌�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎."
type : "warning",
showCancelButton : true,
confirmButtonColor : "#DD6B55",
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);
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 40855c9..154ae90 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -106,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;
@@ -123,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",
@@ -275,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); // "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣"
}
});
}
diff --git a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
index 39c51bf..96037b7 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
@@ -1,78 +1,8 @@
-<!--<div class="row" ng-controller="workspaceDepartmentConfigController">
- <div class="col-lg-12">
- <div class="projects-list">
- <div class="project-box">
- <div class="project-head">
- <div class="project-title">
- <h5 class="bold">
- <span class="text-primary">{{vm.workspaceVo.name}}</span> <span translate="common.information">�젙蹂�</span>
- </h5>
- </div>
- </div>
- <div class="project-info">
- <div class="row align-items-center">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-lg-3 text-center b-r">
- <div class="el-tablo highlight">
- <div class="label" translate="managementWorkspace.numberOfParticipants">
- 李몄뿬 媛��뒫 �씤�썝
- </div>
- <div class="value text-danger">
- {{vm.workspaceVo.maxUser}} <span translate="common.userNum">紐�</span>
- </div>
-
- </div>
- </div>
- <div class="col-lg-3 text-center b-r">
- <div class="el-tablo highlight">
- <div class="label" translate="managementWorkspace.participation">
- 李몄뿬
- </div>
- <div class="value text-primary">
- {{vm.workspaceVo.activeUser}}<span translate="common.userNum">紐�</span>
- </div>
- </div>
- </div>
- <div class="col-lg-3 text-center b-r">
- <div class="el-tablo highlight">
- <!–
- <div class="label" translate="managementWorkspace.waitForParticipation">
- 李몄뿬 ��湲�
- </div>
- –>
- <div class="label" translate="managementWorkspace.withdrawal">
- �깉�눜
- </div>
- <div class="value text-secondary">
- {{vm.workspaceVo.standByUser}}<span translate="common.userNum">紐�</span>
- </div>
- </div>
- </div>
- <div class="col-lg-3 text-center">
- <div class="el-tablo highlight">
- <div class="label" translate="managementWorkspace.canParticipate">
- 李몄뿬 媛��뒫
- </div>
- <div class="value text-success">
- {{vm.workspaceVo.includeUserCount}}<span translate="common.userNum">紐�</span>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>-->
-
<div class="row" ng-controller="workspaceDepartmentConfigController">
<div class="col-lg-12">
<div class="element-box">
<div class="searchdiv">
- <form name="userWorkspaceForm" role="form" ng-enter="fn.getUserWorkspaceList(0)">
+ <form name="userDepartmentForm" role="form" ng-enter="fn.getDepartmentList(0)">
<div class="row">
<div class="col-xl-2">
<div class="form-group">
@@ -142,7 +72,7 @@
total-items="vm.responseData.page.totalCount"
ng-model="vm.page.selectedPage"
max-size="10"
- ng-click="fn.getUserWorkspaceList(vm.page.selectedPage-1)"
+ ng-click="fn.getDepartmentList(vm.page.selectedPage-1)"
class="pagination pagination-sm"
previous-text="Prev"
next-text="Next"
diff --git a/src/main/webapp/views/workspace/workspaceUserConfig.html b/src/main/webapp/views/workspace/workspaceUserConfig.html
index 3fdeb0a..90ba5e8 100644
--- a/src/main/webapp/views/workspace/workspaceUserConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserConfig.html
@@ -152,22 +152,6 @@
</label>
</div>
</div>
- <!--<div class="col-sm-6 text-right">
- <div class="btn-group">
- <button aria-expanded="false"
- aria-haspopup="true"
- class="btn btn-secondary dropdown-toggle"
- data-toggle="dropdown"
- type="button">異붽�湲곕뒫
- </button>
- <div aria-labelledby="dropdownMenuButton2"
- class="dropdown-menu"
- x-placement="bottom-start"
- style="position: absolute; transform: translate3d(0px, 30px, 0px); top: 0px; left: 0px; will-change: transform;">
- <a class="dropdown-item" href="#"> �궘�젣</a>
- </div>
- </div>
- </div>-->
</div>
</div>
diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
index 6454cb8..6f089ed 100644
--- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
@@ -2,7 +2,7 @@
<div class="col-lg-12">
<div class="element-box">
<div class="searchdiv">
- <form name="userWorkspaceForm" role="form" ng-enter="fn.getUserWorkspaceList(0)">
+ <form name="userLevelForm" role="form" ng-enter="fn.getUserLevelList(0)">
<div class="row">
<div class="col-xl-4">
<div class="form-group" style="margin-left: 50px">
@@ -13,7 +13,7 @@
<div class="col-xl-5">
<div class="form-group form-buttons-w2">
- <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(vm.page.selectedPage-1)">
+ <button class="btn btn-xlg btn-navy" ng-click="fn.getUserLevelList(0)">
<i class="os-icon os-icon-ui-37"></i>
<span translate="common.search">寃��깋</span>
</button>
--
Gitblit v1.8.0