From 4cf0a657b1e55340caf9ed0e384e7acf7f5790ca Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 27 12월 2021 23:01:18 +0900
Subject: [PATCH] 부서명 배열값 합치기 수정
---
src/main/webapp/scripts/config.js | 18 ++++++++++--------
src/main/webapp/scripts/components/auth/auth.session.service.js | 1 +
src/main/webapp/views/common/sidebar.html | 2 +-
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/scripts/components/auth/auth.session.service.js b/src/main/webapp/scripts/components/auth/auth.session.service.js
index f7b844f..19e6e14 100644
--- a/src/main/webapp/scripts/components/auth/auth.session.service.js
+++ b/src/main/webapp/scripts/components/auth/auth.session.service.js
@@ -27,6 +27,7 @@
$rootScope.workspaces = [];
$rootScope.workIssueTypes = []
$rootScope.projects = [];
+ $rootScope.departments = null;
$rootScope.authorities = {};
$rootScope.currentDetailIssueId = null;
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 7804678..be59c2b 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -61,12 +61,6 @@
// 臾몄쓽�븯湲�
$rootScope.information = false;
- // �궗�슜�옄 �벑湲됰챸
- $rootScope.myLevel = "";
-
- // 遺��꽌紐�
- $rootScope.myDepartments = "";
-
// PrimaryWorkspace
$rootScope.hasPrimaryWorkspace = false;
@@ -137,7 +131,6 @@
return true;
};
-
// �씠�뒋 �깮�꽦, �닔�젙�뿉�꽌 �떎以� �꽑�깮, �떒�씪 �꽑�깮 �샃�뀡�뿉 泥댄겕�릺寃� �빐二쇰뒗 湲곕뒫
$rootScope.selectOption = function (useValues, value) {
@@ -295,7 +288,6 @@
if (!$rootScope.isDefined($rootScope.user)) {
return false;
}
-
var permissionVal = $rootScope.mngPermission[userPermission];
if (($rootScope.user.permission & permissionVal) !== 0) {
@@ -336,6 +328,16 @@
if (!$rootScope.isDefined($rootScope.user)) {
return false;
}
+ // 遺��꽌紐� 諛곗뿴 �빀移섍린
+ if ($rootScope.user.departmentVos.length > 0) {
+ $rootScope.departments = '';
+ let separator = ',';
+
+ for (let i = 0; i < $rootScope.user.departmentVos.length; i++) {
+ $rootScope.departments += $rootScope.user.departmentVos[i].departmentName +
+ (i === $rootScope.user.departmentVos.length - 1 ? '': separator);
+ }
+ }
var permissionVal = $rootScope.mngPermission['USER_PERMISSION_MNG_ISSUE_STATUS'];
permissionVal += $rootScope.mngPermission['USER_PERMISSION_MNG_WORKFLOW'];
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index 92c87e3..dc7725e 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -186,7 +186,7 @@
<div class="logged-user-w avatar-inline">
<div class="row mb-1" ng-if="$root.user.levelName != null" >
<span class="issue-main-label offset-detail-5 badge badge-primary">{{$root.user.levelName}}</span>
- <span class="issue-main-label offset-detail-1 badge badge-department">{{$root.myDepartments}}</span>
+ <span class="issue-main-label offset-detail-1 badge badge-department">{{$root.departments}}</span>
</div>
<div class="logged-user-i">
<div class="avatar-w">
--
Gitblit v1.8.0