From 843b991407d0be62a9e476fa45f49fbcb48b4ab6 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 27 12월 2021 21:30:20 +0900
Subject: [PATCH] 이슈 리스트 상세 검색 x 표시 구분 및 사용자 정의필드 정규표현식 개별 변경으로 수정
---
src/main/webapp/scripts/config.js | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 6f6abd8..7804678 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -61,14 +61,17 @@
// 臾몄쓽�븯湲�
$rootScope.information = false;
+ // �궗�슜�옄 �벑湲됰챸
+ $rootScope.myLevel = "";
+
+ // 遺��꽌紐�
+ $rootScope.myDepartments = "";
+
// PrimaryWorkspace
$rootScope.hasPrimaryWorkspace = false;
// 理쒓퀬愿�由ъ옄 議댁옱 �뿬遺�
$rootScope.hasSuperUser = false;
-
- // 硫붿씤 寃��깋 �뿬遺�
- $rootScope.isMainSearch = false;
// ���떆蹂대뱶 �꽑�깮 0:�쟾泥� 1:�봽濡쒖젥�듃
$rootScope.dashboard = 0;
@@ -115,6 +118,8 @@
image : 10485760, // 10MB
file : 314572800 // 100MB
};
+
+ $rootScope.isMainSearch = false; // �넻�빀 寃��깋 �뿬遺�
// �뀒�씠釉� �꽕�젙 諛� 湲곕뒫�쓣 愿�由ы븯�뒗 �꽌鍮꾩뒪
$rootScope.$tableProvider = $tableProvider;
@@ -241,7 +246,7 @@
$rootScope.mngPermission = {
"USER_PERMISSION_MNG_WORKSPACE" : 16384,
"USER_PERMISSION_MNG_PROJECT" : 8192,
- "USER_PERMISSION_MNG_ISSUE_PROJECT_ALL" : 4096,
+ "USER_PERMISSION_MNG_ISSUE" : 4096,
"USER_PERMISSION_MNG_PARTNER" : 2048,
"USER_PERMISSION_MNG_API" : 1024,
"USER_PERMISSION_MNG_ISSUE_STATUS" : 512,
@@ -254,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 () {
@@ -281,6 +304,18 @@
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)) {
@@ -351,12 +386,12 @@
$rootScope.$broadcast("changedLastProject", {id: el.id});
$state.go("issues.list");
}
- /*if (reload) {
+ if (reload) {
$state.go('dashboards.dashboard');
- }*/
+ }
}
});
- //$state.go($state.current, {}, {reload: reload});
+ // $state.go($state.current, {}, {reload: reload});
}
});
}
@@ -503,11 +538,6 @@
$("#page-container").trigger("click");
$("body").unbind("click");
- // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━
- if ($rootScope.isMainSearch) {
- $rootScope.isMainSearch = false;
- }
-
var $uibModalStack = $injector.get('$uibModalStack');
$uibModalStack.dismissAll();
@@ -538,7 +568,8 @@
$tableProvider.reverse = false;
// �씠�뒋 紐⑸줉->�긽�꽭�솕硫댁뿉�꽌 留덉�留됱쑝濡� �젒洹쇳븳 �씠�뒋 �븘�씠�뵒 - �씪�슦�듃 �깉�븣留덈떎 珥덇린�솕
$rootScope.currentDetailIssueId = null;
-
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ // $rootScope.getMyInfo();
$log.debug("toState.name : ", toState.name);
$log.debug("$rootScope.previousStateName �솗�씤 : ", $rootScope.previousStateName);
@@ -555,6 +586,7 @@
$rootScope.checkPrimaryWorkspace();
}
}
+
});
// if ui-router $http occur error, trigger this event
@@ -591,4 +623,5 @@
return ctxPath;
})());
+
});
--
Gitblit v1.8.0