From 4545664bbece1b1b185945376b344b1660669a53 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 17:40:35 +0900
Subject: [PATCH] ㅐ 오타 제거
---
src/main/webapp/scripts/config.js | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 3bf1da7..4eb1604 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -35,7 +35,7 @@
// 濡쒓렇 �젣�뼱
$logProvider.debugEnabled(true);
})
- .run(function ($rootScope, $state, $sce, $log, $injector, $translate, $tableProvider, Principal, Auth, Language, SweetAlert, $filter, Workspace, $resourceProvider, User, constants, Project) {
+ .run(function ($rootScope, $state, $sce, $log, $injector, $translate, $tableProvider, $relProvider, $downProvider, Principal, Auth, Language, SweetAlert, $filter, Workspace, $resourceProvider, User, constants, Project) {
$rootScope.$state = $state;
// html �깭洹� �쎒 蹂댁븞 �쟻�슜�븯�뿬 諛붿씤�뵫.
@@ -66,9 +66,6 @@
// 理쒓퀬愿�由ъ옄 議댁옱 �뿬遺�
$rootScope.hasSuperUser = false;
-
- // 硫붿씤 寃��깋 �뿬遺�
- $rootScope.isMainSearch = false;
// ���떆蹂대뱶 �꽑�깮 0:�쟾泥� 1:�봽濡쒖젥�듃
$rootScope.dashboard = 0;
@@ -116,8 +113,16 @@
file : 314572800 // 100MB
};
+ $rootScope.isMainSearch = false; // �넻�빀 寃��깋 �뿬遺�
+
// �뀒�씠釉� �꽕�젙 諛� 湲곕뒫�쓣 愿�由ы븯�뒗 �꽌鍮꾩뒪
$rootScope.$tableProvider = $tableProvider;
+
+ // �뿰愿��뀒�씠釉� �꽕�젙 諛� 湲곕뒫 愿�由ы븯�뒗 �꽌鍮꾩뒪
+ $rootScope.$relProvider = $relProvider;
+
+ // �븯�쐞�뀒�씠釉� �꽕�젙 諛� 湲곕뒫 愿�由ы븯�뒗 �꽌鍮꾩뒪
+ $rootScope.$downProvider = $downProvider;
// html tag convert - �떊猶고븷 �닔 �엳�뒗 �엯�젰 媛믪씪 �븣留� �궗�슜, �궗�슜�옄媛� �벑濡앺븯�뒗 媛믪뿉�뒗 �궗�슜 湲덉�
$rootScope.trustAsHtml = function (string) {
@@ -132,7 +137,6 @@
return true;
};
-
// �씠�뒋 �깮�꽦, �닔�젙�뿉�꽌 �떎以� �꽑�깮, �떒�씪 �꽑�깮 �샃�뀡�뿉 泥댄겕�릺寃� �빐二쇰뒗 湲곕뒫
$rootScope.selectOption = function (useValues, value) {
@@ -241,7 +245,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 +258,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 () {
@@ -272,7 +294,6 @@
if (!$rootScope.isDefined($rootScope.user)) {
return false;
}
-
var permissionVal = $rootScope.mngPermission[userPermission];
if (($rootScope.user.permission & permissionVal) !== 0) {
@@ -281,6 +302,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)) {
@@ -300,6 +333,16 @@
$rootScope.checkMngPermissionSettings = function () {
if (!$rootScope.isDefined($rootScope.user)) {
return false;
+ }
+ // 遺��꽌紐� 諛곗뿴 �빀移섍린
+ if ($rootScope.user.departmentVos.length > 0) {
+ $rootScope.departments = '';
+ let separator = ',';
+
+ for (let i = 0; i < $rootScope.user.departmentVos.length; i++) {
+ $rootScope.departments += $rootScope.user.departmentVos[i].departmentName +
+ (i === $rootScope.user.departmentVos.length - 1 ? '': separator);
+ }
}
var permissionVal = $rootScope.mngPermission['USER_PERMISSION_MNG_ISSUE_STATUS'];
@@ -351,12 +394,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});
}
});
}
@@ -531,9 +574,13 @@
// table orderBy column init setting
$tableProvider.setOrderByColumn();
$tableProvider.reverse = false;
+
+ $relProvider.setOrderByColumn();
+ $relProvider.reverse = false;
// �씠�뒋 紐⑸줉->�긽�꽭�솕硫댁뿉�꽌 留덉�留됱쑝濡� �젒洹쇳븳 �씠�뒋 �븘�씠�뵒 - �씪�슦�듃 �깉�븣留덈떎 珥덇린�솕
$rootScope.currentDetailIssueId = null;
-
+ // �궗�슜�옄 �젙蹂대�� 媛��졇�삩�떎.
+ // $rootScope.getMyInfo();
$log.debug("toState.name : ", toState.name);
$log.debug("$rootScope.previousStateName �솗�씤 : ", $rootScope.previousStateName);
@@ -550,6 +597,7 @@
$rootScope.checkPrimaryWorkspace();
}
}
+
});
// if ui-router $http occur error, trigger this event
@@ -586,4 +634,5 @@
return ctxPath;
})());
+
});
--
Gitblit v1.8.0