From debc7d47107b1fc4509593d942d775f4374a3416 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 10 12월 2021 13:29:20 +0900
Subject: [PATCH] 권한 수정 완료
---
src/main/webapp/scripts/app/common/common.controller.js | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 6712ed3..611a551 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -51,9 +51,9 @@
});
$scope.$on("changedLastProject", function () {
- if ($rootScope.workProject != null) {
+ //if ($rootScope.workProject != null) {
$scope.fn.findIssueList($rootScope.workProject.id);
- }
+ //}
});
function setLastIssueType() {
@@ -69,7 +69,7 @@
}
}
- function changeIssueListMenu(issueTypeId) {
+ function changeIssueListMenu(issueTypeId, changeProject = true) {
$rootScope.issueTypeMenu = null;
for (var issueType of $rootScope.workIssueTypes) {
if (issueType.id === issueTypeId) {
@@ -79,22 +79,26 @@
}
// sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
- $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+ if (changeProject) {
- if ($rootScope.issueTypeMenu != null) {
- moveMenu("issues.list");
+ $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);
@@ -253,10 +257,24 @@
if ($rootScope.workIssueTypes != null && $rootScope.workIssueTypes.length > 0) {
$rootScope.workIssueTypes.forEach(function (issueType) {
+
+ var selectIssueTypeId = null;
+ 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