From ee356fead3840ad1e34bee7a15d72fdbc435ecb0 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 수, 08 12월 2021 17:20:13 +0900 Subject: [PATCH] - api 하위 이슈 설정메뉴 수정 - 이슈 유형마다 자동 종료 설정할수있도록 수정 - 기타 오류 수정 --- src/main/webapp/scripts/app/common/common.controller.js | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js index 22d53cf..83df750 100644 --- a/src/main/webapp/scripts/app/common/common.controller.js +++ b/src/main/webapp/scripts/app/common/common.controller.js @@ -80,23 +80,25 @@ // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙 if (changeProject) { + + $rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu); $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false); if ($rootScope.issueTypeMenu != null) { moveMenu("issues.list"); } } - - $rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu); + //moveMenu("issues.list"); if ($rootScope.user.lastIssueTypeId !== issueTypeId) { $scope.fn.setLastIssueType(issueTypeId); } + } function moveMenu(stateName) { - if ($state.current.name == stateName) { + if ($state.current.name === stateName) { $state.reload(); } else { $state.go(stateName); @@ -260,15 +262,19 @@ if (issueType.id === $rootScope.user.lastIssueTypeId) { selectIssueTypeId = issueType.id; $scope.fn.changeIssueListMenu(issueType.id, false); + // $state.go('dashboards.dashboard'); } if (selectIssueTypeId == null) { $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id, false); + } }); - } else { - $state.go('dashboards.dashboard'); } + // ���돩蹂대뱶濡� 媛��뒗�뜲 �봽濡쒖젥�듃瑜� �깮�꽦�븯嫄곕굹 �닔�젙�빐�룄 嫄몃━�뒗 議곌굔�씠�떎. + // else { + // $state.go('dashboards.dashboard'); + // } } else { SweetAlert.error($filter("translate")("managementType.failedToIssueTypeList"), result.data.message.message); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣" -- Gitblit v1.8.0