From 8a4943b4852eaed243587719cbdf7de0bfe191ba Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 02 12월 2021 21:53:04 +0900
Subject: [PATCH] 이슈 타입에 따라 프로젝트 선택 변경 수정
---
src/main/webapp/views/issue/issueAdd.html | 3 ++-
src/main/webapp/scripts/app/common/common.controller.js | 20 ++++++++++++++++----
2 files changed, 18 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 6712ed3..22d53cf 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,10 +79,12 @@
}
// 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);
@@ -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');
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index f5dc710..a961f0a 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -59,7 +59,8 @@
ng-model="vm.form.issueTypeId"
ng-change="fn.getIssueTypeCustomFields()"
ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
- required>
+ required
+ disabled>
<option value="" translate="common.selectTarget" ng-style="{ 'color' : '#353535' }"><span
translate="common.selectTarget">���긽 �꽑�깮</span>
</option>
--
Gitblit v1.8.0