From 5d6ea07024b475d94b997ad5972f433cf0b5aae4 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 일, 12 12월 2021 18:13:38 +0900 Subject: [PATCH] - 상단 검색 기능 추가 --- src/main/webapp/scripts/config.js | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js index 74ad46c..3bf1da7 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,9 +239,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 +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 () { @@ -317,7 +335,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 +347,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