From 5d4d5135cf08208832f6308d9f03c25de17e9f66 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 22:24:55 +0900
Subject: [PATCH] 사용자정의 필드 날짜 수정, 프로젝트 생성시 대쉬보드 이동 오류 수정
---
src/main/webapp/scripts/app/common/common.controller.js | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..fd7f242 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -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,13 +79,15 @@
}
// sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
- $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+ if (changeProject) {
+ $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
- if ($rootScope.issueTypeMenu != null) {
- moveMenu("issues.list");
+ if ($rootScope.issueTypeMenu != null) {
+ moveMenu("issues.list");
+ }
}
-
- $rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
+ moveMenu("issues.list");
+ //$rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
$scope.fn.setLastIssueType(issueTypeId);
@@ -253,6 +255,16 @@
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);
+ }
+
+ if (selectIssueTypeId == null) {
+ $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id, false);
+ }
});
} else {
$state.go('dashboards.dashboard');
--
Gitblit v1.8.0