From 96562269394cda606de2553c21af839a4526376f Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 02 12월 2021 21:34:05 +0900
Subject: [PATCH] 이슈 타입에 따라 프로젝트 선택 변경 수정
---
src/main/webapp/scripts/config.js | 16 ++++++----------
src/main/webapp/scripts/app/common/common.controller.js | 26 +++++++++++---------------
2 files changed, 17 insertions(+), 25 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..6712ed3 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
};
@@ -47,6 +48,12 @@
// �봽濡쒖젥�듃 紐⑸줉 �솕硫� �깉濡� 怨좎묠�떆
$scope.$on("getProjectList", function () {
findAllWorkproject();
+ });
+
+ $scope.$on("changedLastProject", function () {
+ if ($rootScope.workProject != null) {
+ $scope.fn.findIssueList($rootScope.workProject.id);
+ }
});
function setLastIssueType() {
@@ -72,7 +79,7 @@
}
// sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
- $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id);
+ $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
if ($rootScope.issueTypeMenu != null) {
moveMenu("issues.list");
@@ -228,11 +235,7 @@
});
}
-
// �쁽�옱 �봽濡쒖젥�듃 蹂�寃쎌떆
- $scope.$on("changeLastProject", function (event, args) {
- findIssueList(args.id);
- });
// �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
function findIssueList(projectId) {
@@ -250,16 +253,6 @@
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);
- }
-
- if (selectIssueTypeId == null) {
- $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id);
- }
});
} else {
$state.go('dashboards.dashboard');
@@ -276,6 +269,8 @@
// �봽濡쒖젥�듃 蹂�寃�
function changeLastProject(projectId) {
$rootScope.changeLastProject(projectId);
+
+
}
// �뾽臾� 怨듦컙 蹂�寃�
@@ -455,6 +450,7 @@
$scope.fn.findAllWorkproject();
});
+
// 10珥덈쭏�떎 �쎒 �냼耳� �뿰寃곗쓣 �솗�씤�븯�뒗 �뤃留� �씠踰ㅽ듃
$interval(function () {
//$log.debug("10珥덈쭏�떎 �냼耳� �뿰寃곗쓣 �솗�씤�빀�땲�떎.");
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index be492fe..ec01f69 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -317,13 +317,7 @@
return false;
};
- // �궗�씠�뱶諛� �씠�뒋�쑀�삎 �꽑�깮�떆 �봽濡쒖젥�듃 �븘�씠�뵒 �뀑�똿
- $rootScope.$on("changeIssueListMenu", function (event, args){
- var issueTypeVo = args;
- $rootScope.changeLastProject(issueTypeVo.projectVo.id);
- });
-
- $rootScope.changeLastProject = function (projectId, reload = true) {
+ $rootScope.changeLastProject = function (projectId, reload = true, onEvent = true) {
if ($rootScope.workProject == null || $rootScope.workProject.id !== projectId ) {
if (User != null) {
User.updateLastProject($resourceProvider.getContent(
@@ -335,11 +329,13 @@
$rootScope.projects.forEach(function (el) {
if (el.id == projectId) {
$rootScope.workProject = el;
-
- $rootScope.$broadcast("changeLastProject", {id: el.id});
+ if (onEvent) {
+ $rootScope.$broadcast("changedLastProject", {id: el.id});
+ }
+ $state.go('dashboards.dashboard');
}
});
- $state.go($state.current, {}, {reload: reload});
+ // $state.go($state.current, {}, {reload: reload});
}
});
}
--
Gitblit v1.8.0