From 4d06a7593fba3df556fc3728c142554907c6b157 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 15 12월 2021 10:46:45 +0900 Subject: [PATCH] '전체 이슈 프로젝트 보기' 권한 '이슈 관리' 권한으로 변경 - 이슈관리: 모든 이슈 수정 가능 --- src/main/webapp/scripts/config.js | 74 +++++++++++++++++++++++++----------- 1 files changed, 51 insertions(+), 23 deletions(-) diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js index d118d3c..920039d 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,12 @@ // 沅뚰븳 由ъ뒪�듃 $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_ISSUE_SYSTEM" : 512, "USER_PERMISSION_MNG_WORKFLOW" : 256, "USER_PERMISSION_MNG_CUSTOME_FIELD" : 128, "USER_PERMISSION_MNG_ISSUE_TYPE" : 64, @@ -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,28 +335,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 () { @@ -480,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