From 663ea2f2eca3b7da3bdaffb13eaac44433adb62f Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 16 12월 2021 13:13:54 +0900
Subject: [PATCH] 기록탭 html 태그 보이는 내용 수정 / 사이드바 사용자 프로필 등급, 부서명 표시 수정
---
src/main/webapp/scripts/config.js | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 3bf1da7..3622771 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -61,6 +61,12 @@
// 臾몄쓽�븯湲�
$rootScope.information = false;
+ // �궗�슜�옄 �벑湲됰챸
+ $rootScope.myLevel = "";
+
+ // 遺��꽌紐�
+ $rootScope.myDepartments = "";
+
// PrimaryWorkspace
$rootScope.hasPrimaryWorkspace = false;
@@ -241,10 +247,10 @@
$rootScope.mngPermission = {
"USER_PERMISSION_MNG_WORKSPACE" : 16384,
"USER_PERMISSION_MNG_PROJECT" : 8192,
- "USER_PERMISSION_MNG_ISSUE_PROJECT_ALL" : 4096,
+ "USER_PERMISSION_MNG_ISSUE" : 4096,
"USER_PERMISSION_MNG_PARTNER" : 2048,
"USER_PERMISSION_MNG_API" : 1024,
- "USER_PERMISSION_MNG_ISSUE_STATUS" : 512,
+ "USER_PERMISSION_MNG_ISSUE_SYSTEM" : 512,
"USER_PERMISSION_MNG_WORKFLOW" : 256,
"USER_PERMISSION_MNG_CUSTOME_FIELD" : 128,
"USER_PERMISSION_MNG_ISSUE_TYPE" : 64,
@@ -281,6 +287,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)) {
@@ -351,12 +369,12 @@
$rootScope.$broadcast("changedLastProject", {id: el.id});
$state.go("issues.list");
}
- /*if (reload) {
+ if (reload) {
$state.go('dashboards.dashboard');
- }*/
+ }
}
});
- //$state.go($state.current, {}, {reload: reload});
+ // $state.go($state.current, {}, {reload: reload});
}
});
}
@@ -503,6 +521,11 @@
$("#page-container").trigger("click");
$("body").unbind("click");
+ // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━
+ if ($rootScope.isMainSearch) {
+ $rootScope.isMainSearch = false;
+ }
+
var $uibModalStack = $injector.get('$uibModalStack');
$uibModalStack.dismissAll();
@@ -533,7 +556,8 @@
$tableProvider.reverse = false;
// �씠�뒋 紐⑸줉->�긽�꽭�솕硫댁뿉�꽌 留덉�留됱쑝濡� �젒洹쇳븳 �씠�뒋 �븘�씠�뵒 - �씪�슦�듃 �깉�븣留덈떎 珥덇린�솕
$rootScope.currentDetailIssueId = null;
-
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ $rootScope.getMyInfo();
$log.debug("toState.name : ", toState.name);
$log.debug("$rootScope.previousStateName �솗�씤 : ", $rootScope.previousStateName);
@@ -586,4 +610,5 @@
return ctxPath;
})());
+
});
--
Gitblit v1.8.0