From fb0491479b2f1155a458f9cbd65b55d9c5a62e69 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 13:06:40 +0900
Subject: [PATCH] 부서관리와 등급관리 삭제 시 충돌 버그 해결
---
src/main/webapp/views/workspace/workspaceUserLevelConfig.html | 2 +-
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 6 +++---
src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js | 4 ++--
src/main/webapp/views/workspace/workspaceDepartmentConfig.html | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 0b327e6..11d3190 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -18,7 +18,7 @@
$scope.fn.makeTableConfigs = makeTableConfigs; // 遺��꽌 愿�由� 紐⑸줉 �뀒�씠釉� �꽕�젙
$scope.fn.initSearchDepartment = initSearchDepartment; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.departmentAdd = departmentAdd; // 遺��꽌 異붽�
- $scope.fn.removes = removes; // 遺��꽌 �궘�젣
+ $scope.fn.removeDepartments = removeDepartments; // 遺��꽌 �궘�젣
/* $scope.vm �긽�냽 以� */
$scope.vm.search = {
@@ -69,7 +69,7 @@
.setDRenderer("DEPARTMENT_MODIFY"));
$scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentEx")
- .setHWidth("width-120-p")
+ .setHWidth("width-100-p bold")
.setDAlign("text-center")
.setDName("departmentDescription"));
$scope.vm.tableConfigs2.push($tableProvider.config()
@@ -171,7 +171,7 @@
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 �궘�젣 �뙘�뾽
- function removes() {
+ function removeDepartments() {
var removeIds = [];
angular.forEach($scope.vm.responseData.data, function (data) {
diff --git a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
index 694b485..e818c63 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceUserLevelConfig.controller.js
@@ -19,7 +19,7 @@
$scope.fn.initSearchUserLevel = initSearchUserLevel; // 寃��깋 議곌굔 珥덇린�솕
$scope.fn.changePageRowCount = changePageRowCount; // �뾽臾� 怨듦컙 李몄뿬 �궗�슜�옄 紐⑸줉 蹂닿린 媛쒖닔 蹂�寃�
$scope.fn.levelAdd = levelAdd; // �벑湲� 異붽�
- $scope.fn.removes = removes; // �궗�슜�옄 �벑湲� �궘�젣
+ $scope.fn.removeLevels = removeLevels; // �궗�슜�옄 �벑湲� �궘�젣
$scope.fn.makeSearchConditions = makeSearchConditions;
@@ -88,7 +88,7 @@
}
// �궗�슜�옄 �벑湲� �궘�젣
- function removes() {
+ function removeLevels() {
var removeIds = [];
var removePermission = true;
diff --git a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
index b7cf4a6..f2ad479 100644
--- a/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
+++ b/src/main/webapp/views/workspace/workspaceDepartmentConfig.html
@@ -52,7 +52,7 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
<a class="dropdown-item cursor ng-isolate-scope" form-submit="departmentListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removeDepartments()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
</div>
</div>
</form>
diff --git a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
index 6f089ed..3d7a4c5 100644
--- a/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
+++ b/src/main/webapp/views/workspace/workspaceUserLevelConfig.html
@@ -52,7 +52,7 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu" x-placement="bottom-start">
<a class="dropdown-item cursor ng-isolate-scope" form-submit="userLevelListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel" class="ng-scope">�뿊�� �떎�슫濡쒕뱶</span></a>
- <a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removeLevels()"> <span translate="common.delete" class="ng-scope">�궘�젣</span></a>
</div>
</div>
</form>
--
Gitblit v1.8.0