From de6841b2f701995d04cd314585aca41ed3b977be Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 24 12월 2021 13:04:11 +0900
Subject: [PATCH] 탐지정보 안내 문구 표시 수정
---
src/main/webapp/scripts/config.js | 107 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 84 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index d118d3c..7804678 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;
@@ -112,6 +118,8 @@
image : 10485760, // 10MB
file : 314572800 // 100MB
};
+
+ $rootScope.isMainSearch = false; // �넻�빀 寃��깋 �뿬遺�
// �뀒�씠釉� �꽕�젙 諛� 湲곕뒫�쓣 愿�由ы븯�뒗 �꽌鍮꾩뒪
$rootScope.$tableProvider = $tableProvider;
@@ -236,9 +244,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" : 4096,
+ "USER_PERMISSION_MNG_PARTNER" : 2048,
"USER_PERMISSION_MNG_API" : 1024,
"USER_PERMISSION_MNG_ISSUE_STATUS" : 512,
"USER_PERMISSION_MNG_WORKFLOW" : 256,
@@ -250,6 +259,24 @@
"USER_PERMISSION_MNG_EVENT" : 4,
"USER_PERMISSION_MNG_GUIDE" : 2,
};
+
+ // 荑좏궎 ���옣
+ $rootScope.setCookie = function (name, value, exp) {
+ var date = new Date();
+ date.setTime(date.getTime() + exp*24*60*60*1000);
+ document.cookie = name + '=' + value + ';expires=' + date.toUTCString() + ';path=/';
+ };
+
+ // 荑좏궎 媛��졇�삤湲�
+ $rootScope.getCookie = function (name) {
+ var value = document.cookie.match('(^|;) ?' + name + '=([^;]*)(;|$)');
+ return value? value[2] : null;
+ }
+
+ // 荑좏궎 �궘�젣
+ $rootScope.deleteCookie = function (name) {
+ document.cookie = name + '=; expires=Thu, 01 Jan 1999 00:00:10 GMT;';
+ }
// �쁽�옱 �꽑�깮�맂 �씠�뒋 ���엯 �븘�씠�뵒 媛��졇�삤湲�
$rootScope.getCurrentIssueTypeId = function () {
@@ -277,6 +304,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,28 +370,33 @@
return false;
};
- $rootScope.changeLastProject = function (projectId, reload = true) {
- if (User != null) {
- User.updateLastProject($resourceProvider.getContent(
- {lastProjectId: projectId},
- $resourceProvider.getPageContent(0, 0))).then(function (result) {
+ $rootScope.changeLastProject = function (projectId, reload = true, onEvent = true) {
+ if ($rootScope.workProject == null || $rootScope.workProject.id !== projectId ) {
+ if (User != null) {
+ User.updateLastProject($resourceProvider.getContent(
+ {lastProjectId: projectId},
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
- if (result.data.message.status === "success") {
- $rootScope.user = result.data.data;
- $rootScope.projects.forEach(function (el) {
- if (el.id == projectId) {
- $rootScope.workProject = el;
-
- $rootScope.$broadcast("changeLastProject", { id : el.id });
- }
- });
- $state.go($state.current, {}, {reload: reload});
- }
- });
+ if (result.data.message.status === "success") {
+ $rootScope.user = result.data.data;
+ $rootScope.projects.forEach(function (el) {
+ if (el.id == projectId) {
+ $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});
+ }
+ });
+ }
}
};
-
-
// �봽濡쒖젥�듃 愿�由� 沅뚰븳�씠 �엳�뒗吏� �솗�씤�븳�떎
$rootScope.checkMngPermissionProject = function () {
@@ -510,7 +568,8 @@
$tableProvider.reverse = false;
// �씠�뒋 紐⑸줉->�긽�꽭�솕硫댁뿉�꽌 留덉�留됱쑝濡� �젒洹쇳븳 �씠�뒋 �븘�씠�뵒 - �씪�슦�듃 �깉�븣留덈떎 珥덇린�솕
$rootScope.currentDetailIssueId = null;
-
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ // $rootScope.getMyInfo();
$log.debug("toState.name : ", toState.name);
$log.debug("$rootScope.previousStateName �솗�씤 : ", $rootScope.previousStateName);
@@ -527,6 +586,7 @@
$rootScope.checkPrimaryWorkspace();
}
}
+
});
// if ui-router $http occur error, trigger this event
@@ -563,4 +623,5 @@
return ctxPath;
})());
+
});
--
Gitblit v1.8.0