From 385f0d9070b90d2253ddaeaf1b2e2491ebaeda95 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 토, 11 12월 2021 21:34:18 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/config.js | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 74ad46c..29595a6 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -236,9 +236,10 @@
// 沅뚰븳 由ъ뒪�듃
$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_PROJECT_ALL" : 4096,
+ "USER_PERMISSION_MNG_PARTNER" : 2048,
"USER_PERMISSION_MNG_API" : 1024,
"USER_PERMISSION_MNG_ISSUE_STATUS" : 512,
"USER_PERMISSION_MNG_WORKFLOW" : 256,
@@ -277,6 +278,20 @@
return false;
};
+
+ /*$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 +332,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 +344,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 () {
--
Gitblit v1.8.0