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 | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 1750d6d..fd7f242 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -27,6 +27,7 @@
};
$scope.vm = {
+ workProject : -1,
message: "",
workProjectId : -1
};
@@ -49,6 +50,12 @@
findAllWorkproject();
});
+ $scope.$on("changedLastProject", function () {
+ if ($rootScope.workProject != null) {
+ $scope.fn.findIssueList($rootScope.workProject.id);
+ }
+ });
+
function setLastIssueType() {
if (User != null) {
User.updateLastIssueType($resourceProvider.getContent(
@@ -62,7 +69,7 @@
}
}
- function changeIssueListMenu(issueTypeId) {
+ function changeIssueListMenu(issueTypeId, changeProject = true) {
$rootScope.issueTypeMenu = null;
for (var issueType of $rootScope.workIssueTypes) {
if (issueType.id === issueTypeId) {
@@ -72,13 +79,15 @@
}
// sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
- $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id);
+ 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);
@@ -228,11 +237,7 @@
});
}
-
// �쁽�옱 �봽濡쒖젥�듃 蹂�寃쎌떆
- $scope.$on("changeLastProject", function (event, args) {
- findIssueList(args.id);
- });
// �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
function findIssueList(projectId) {
@@ -254,11 +259,11 @@
var selectIssueTypeId = null;
if (issueType.id === $rootScope.user.lastIssueTypeId) {
selectIssueTypeId = issueType.id;
- $scope.fn.changeIssueListMenu(issueType.id);
+ $scope.fn.changeIssueListMenu(issueType.id, false);
}
if (selectIssueTypeId == null) {
- $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id);
+ $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id, false);
}
});
} else {
@@ -276,6 +281,8 @@
// �봽濡쒖젥�듃 蹂�寃�
function changeLastProject(projectId) {
$rootScope.changeLastProject(projectId);
+
+
}
// �뾽臾� 怨듦컙 蹂�寃�
@@ -455,6 +462,7 @@
$scope.fn.findAllWorkproject();
});
+
// 10珥덈쭏�떎 �쎒 �냼耳� �뿰寃곗쓣 �솗�씤�븯�뒗 �뤃留� �씠踰ㅽ듃
$interval(function () {
//$log.debug("10珥덈쭏�떎 �냼耳� �뿰寃곗쓣 �솗�씤�빀�땲�떎.");
--
Gitblit v1.8.0