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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 920039d..be59c2b 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -67,9 +67,6 @@
// 理쒓퀬愿�由ъ옄 議댁옱 �뿬遺�
$rootScope.hasSuperUser = false;
- // 硫붿씤 寃��깋 �뿬遺�
- $rootScope.isMainSearch = false;
-
// ���떆蹂대뱶 �꽑�깮 0:�쟾泥� 1:�봽濡쒖젥�듃
$rootScope.dashboard = 0;
@@ -116,6 +113,8 @@
file : 314572800 // 100MB
};
+ $rootScope.isMainSearch = false; // �넻�빀 寃��깋 �뿬遺�
+
// �뀒�씠釉� �꽕�젙 諛� 湲곕뒫�쓣 愿�由ы븯�뒗 �꽌鍮꾩뒪
$rootScope.$tableProvider = $tableProvider;
@@ -132,7 +131,6 @@
return true;
};
-
// �씠�뒋 �깮�꽦, �닔�젙�뿉�꽌 �떎以� �꽑�깮, �떒�씪 �꽑�깮 �샃�뀡�뿉 泥댄겕�릺寃� �빐二쇰뒗 湲곕뒫
$rootScope.selectOption = function (useValues, value) {
@@ -244,7 +242,7 @@
"USER_PERMISSION_MNG_ISSUE" : 4096,
"USER_PERMISSION_MNG_PARTNER" : 2048,
"USER_PERMISSION_MNG_API" : 1024,
- "USER_PERMISSION_MNG_ISSUE_SYSTEM" : 512,
+ "USER_PERMISSION_MNG_ISSUE_STATUS" : 512,
"USER_PERMISSION_MNG_WORKFLOW" : 256,
"USER_PERMISSION_MNG_CUSTOME_FIELD" : 128,
"USER_PERMISSION_MNG_ISSUE_TYPE" : 64,
@@ -254,6 +252,24 @@
"USER_PERMISSION_MNG_EVENT" : 4,
"USER_PERMISSION_MNG_GUIDE" : 2,
};
+
+ // 荑좏궎 ���옣
+ $rootScope.setCookie = function (name, value, exp) {
+ var date = new Date();
+ date.setTime(date.getTime() + exp*24*60*60*1000);
+ document.cookie = name + '=' + value + ';expires=' + date.toUTCString() + ';path=/';
+ };
+
+ // 荑좏궎 媛��졇�삤湲�
+ $rootScope.getCookie = function (name) {
+ var value = document.cookie.match('(^|;) ?' + name + '=([^;]*)(;|$)');
+ return value? value[2] : null;
+ }
+
+ // 荑좏궎 �궘�젣
+ $rootScope.deleteCookie = function (name) {
+ document.cookie = name + '=; expires=Thu, 01 Jan 1999 00:00:10 GMT;';
+ }
// �쁽�옱 �꽑�깮�맂 �씠�뒋 ���엯 �븘�씠�뵒 媛��졇�삤湲�
$rootScope.getCurrentIssueTypeId = function () {
@@ -272,7 +288,6 @@
if (!$rootScope.isDefined($rootScope.user)) {
return false;
}
-
var permissionVal = $rootScope.mngPermission[userPermission];
if (($rootScope.user.permission & permissionVal) !== 0) {
@@ -281,6 +296,18 @@
return false;
};
+
+ // $rootScope.getMyInfo = function () {
+ //
+ // User.findMyLevelAndDepartment($resourceProvider.getContent({},
+ // $resourceProvider.getPageContent(0, 0))).then(function (result) {
+ //
+ // if (result.data.message.status === "success") {
+ // $rootScope.myLevel = result.data.data.levelName
+ // $rootScope.myDepartments = result.data.data.departmentName
+ // }
+ // });
+ // }
/*$rootScope.checkMngPermissionViewIssueAndProject = function (userPermission) {
if (!$rootScope.isDefined($rootScope.user)) {
@@ -300,6 +327,16 @@
$rootScope.checkMngPermissionSettings = function () {
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'];
@@ -503,11 +540,6 @@
$("#page-container").trigger("click");
$("body").unbind("click");
- // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━
- if ($rootScope.isMainSearch) {
- $rootScope.isMainSearch = false;
- }
-
var $uibModalStack = $injector.get('$uibModalStack');
$uibModalStack.dismissAll();
@@ -538,7 +570,8 @@
$tableProvider.reverse = false;
// �씠�뒋 紐⑸줉->�긽�꽭�솕硫댁뿉�꽌 留덉�留됱쑝濡� �젒洹쇳븳 �씠�뒋 �븘�씠�뵒 - �씪�슦�듃 �깉�븣留덈떎 珥덇린�솕
$rootScope.currentDetailIssueId = null;
-
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ // $rootScope.getMyInfo();
$log.debug("toState.name : ", toState.name);
$log.debug("$rootScope.previousStateName �솗�씤 : ", $rootScope.previousStateName);
@@ -555,6 +588,7 @@
$rootScope.checkPrimaryWorkspace();
}
}
+
});
// if ui-router $http occur error, trigger this event
@@ -591,4 +625,5 @@
return ctxPath;
})());
+
});
--
Gitblit v1.8.0