From e2c9d5c6cc9bf4a4314dcbce17e1336e8f78ebf8 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 16 12월 2021 11:20:10 +0900
Subject: [PATCH] 사이드바 프로필 사용자등급, 부서표시
---
src/main/webapp/scripts/config.js | 66 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 74ad46c..44c2d61 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -61,11 +61,20 @@
// 臾몄쓽�븯湲�
$rootScope.information = false;
+ // �궗�슜�옄 �벑湲됰챸
+ $rootScope.myLevel = "";
+
+ // 遺��꽌紐�
+ $rootScope.myDepartments = "";
+
// PrimaryWorkspace
$rootScope.hasPrimaryWorkspace = false;
// 理쒓퀬愿�由ъ옄 議댁옱 �뿬遺�
$rootScope.hasSuperUser = false;
+
+ // 硫붿씤 寃��깋 �뿬遺�
+ $rootScope.isMainSearch = false;
// ���떆蹂대뱶 �꽑�깮 0:�쟾泥� 1:�봽濡쒖젥�듃
$rootScope.dashboard = 0;
@@ -236,11 +245,12 @@
// 沅뚰븳 由ъ뒪�듃
$rootScope.mngPermission = {
- "USER_PERMISSION_MNG_PARTNER" : 8192,
- "USER_PERMISSION_MNG_WORKSPACE" : 4096,
- "USER_PERMISSION_MNG_PROJECT" : 2048,
+ "USER_PERMISSION_MNG_WORKSPACE" : 16384,
+ "USER_PERMISSION_MNG_PROJECT" : 8192,
+ "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,
@@ -277,6 +287,34 @@
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.getMyInfo();
+
+ /*$rootScope.checkMngPermissionViewIssueAndProject = function (userPermission) {
+ if (!$rootScope.isDefined($rootScope.user)) {
+ return false;
+ }
+
+ var permissionVal = $rootScope.mngPermission[userPermission];
+
+ if (($rootScope.user.permission & permissionVal) !== 0) {
+ return true;
+ }
+
+ return false;
+ };*/
// setting 愿�由ъ옄�씤吏� �솗�씤�븳�떎.
$rootScope.checkMngPermissionSettings = function () {
@@ -317,7 +355,7 @@
return false;
};
- $rootScope.changeLastProject = function (projectId, reload = true) {
+ $rootScope.changeLastProject = function (projectId, reload = true, onEvent = true) {
if ($rootScope.workProject == null || $rootScope.workProject.id !== projectId ) {
if (User != null) {
User.updateLastProject($resourceProvider.getContent(
@@ -329,18 +367,21 @@
$rootScope.projects.forEach(function (el) {
if (el.id == projectId) {
$rootScope.workProject = el;
-
- $rootScope.$broadcast("changeLastProject", {id: el.id});
+ if (onEvent) {
+ $rootScope.$broadcast("changedLastProject", {id: el.id});
+ $state.go("issues.list");
+ }
+ if (reload) {
+ $state.go('dashboards.dashboard');
+ }
}
});
- $state.go($state.current, {}, {reload: reload});
+ // $state.go($state.current, {}, {reload: reload});
}
});
}
}
};
-
-
// �봽濡쒖젥�듃 愿�由� 沅뚰븳�씠 �엳�뒗吏� �솗�씤�븳�떎
$rootScope.checkMngPermissionProject = function () {
@@ -482,6 +523,11 @@
$("#page-container").trigger("click");
$("body").unbind("click");
+ // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━
+ if ($rootScope.isMainSearch) {
+ $rootScope.isMainSearch = false;
+ }
+
var $uibModalStack = $injector.get('$uibModalStack');
$uibModalStack.dismissAll();
--
Gitblit v1.8.0