From 4f4fd9ee8b3315bc433b1893dbff008efdb03230 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 22 12월 2021 16:36:06 +0900
Subject: [PATCH] - API 설정 화면에서 프로젝트에서 설정된 이슈유형만 보여주도록 수정
---
src/main/webapp/scripts/config.js | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 74ad46c..60ab2f5 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;
@@ -236,11 +242,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 +284,32 @@
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)) {
+ return false;
+ }
+
+ var permissionVal = $rootScope.mngPermission[userPermission];
+
+ if (($rootScope.user.permission & permissionVal) !== 0) {
+ return true;
+ }
+
+ return false;
+ };*/
// setting 愿�由ъ옄�씤吏� �솗�씤�븳�떎.
$rootScope.checkMngPermissionSettings = function () {
@@ -317,7 +350,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 +362,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 () {
@@ -512,7 +548,8 @@
$tableProvider.reverse = false;
// �씠�뒋 紐⑸줉->�긽�꽭�솕硫댁뿉�꽌 留덉�留됱쑝濡� �젒洹쇳븳 �씠�뒋 �븘�씠�뵒 - �씪�슦�듃 �깉�븣留덈떎 珥덇린�솕
$rootScope.currentDetailIssueId = null;
-
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ // $rootScope.getMyInfo();
$log.debug("toState.name : ", toState.name);
$log.debug("$rootScope.previousStateName �솗�씤 : ", $rootScope.previousStateName);
@@ -529,6 +566,7 @@
$rootScope.checkPrimaryWorkspace();
}
}
+
});
// if ui-router $http occur error, trigger this event
@@ -565,4 +603,5 @@
return ctxPath;
})());
+
});
--
Gitblit v1.8.0