From 6587fd584cb672bbb8a4539cdc1c5714efb8b48f Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 17:54:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/config.js | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 9c78c21..e2ad463 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -67,6 +67,9 @@
// 理쒓퀬愿�由ъ옄 議댁옱 �뿬遺�
$rootScope.hasSuperUser = false;
+ // 硫붿씤 寃��깋 �뿬遺�
+ $rootScope.isMainSearch = false;
+
// ���떆蹂대뱶 �꽑�깮 0:�쟾泥� 1:�봽濡쒖젥�듃
$rootScope.dashboard = 0;
@@ -236,11 +239,10 @@
// 沅뚰븳 由ъ뒪�듃
$rootScope.mngPermission = {
- "USER_PERMISSION_MNG_ISSUE_ALL" : 32768,
- "USER_PERMISSION_MNG_PROJECT_ALL" : 16384,
- "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,
@@ -279,6 +281,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 () {
@@ -333,21 +349,19 @@
$rootScope.workProject = el;
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 () {
@@ -489,6 +503,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