From cbaf5a17c5185b2ef897fc9fe1fbb9fecb18ac41 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 토, 11 12월 2021 18:26:09 +0900
Subject: [PATCH] - 이슈 상세화면에서 하위 이슈/연관 이슈 검색시 오류 수정

---
 src/main/webapp/scripts/app/common/common.controller.js |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index fd7f242..1859208 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -37,7 +37,7 @@
                 //  �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
                 $scope.$on("makeIssueSearch", function (event, args) {
                     //  �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
-                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
+                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber, args.issueTypeId);
                 });
 
                 // �씠�뒋 �쑀�삎 蹂�寃쎌떆
@@ -51,9 +51,9 @@
                 });
 
                 $scope.$on("changedLastProject", function () {
-                    if ($rootScope.workProject != null) {
+                    //if ($rootScope.workProject != null) {
                         $scope.fn.findIssueList($rootScope.workProject.id);
-                    }
+                    //}
                 });
 
                 function setLastIssueType() {
@@ -80,23 +80,25 @@
 
                     // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
                     if (changeProject) {
+
+                        $rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
                         $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
 
                         if ($rootScope.issueTypeMenu != null) {
                             moveMenu("issues.list");
                         }
                     }
-                    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);
@@ -116,7 +118,7 @@
                 }
 
                 //  �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
-                function makeIssueSearch(projectKey, issueNumber) {
+                function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
                     var combinationIssueNumber = projectKey;
                     if (issueNumber != undefined) {
                         combinationIssueNumber += "-" + issueNumber;
@@ -134,6 +136,7 @@
                         $resourceProvider.getPageContent(0, 0))).then(function (result) {
 
                         if (result.data.message.status === "success") {
+                            $scope.fn.changeIssueListMenu(issueTypeId);
                             moveMenu("issues.list");
                         } else {
                             SweetAlert.error($filter("translate")("issue.failedToSaveFieldConditions"), result.data.message.message); // "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣"
@@ -260,15 +263,19 @@
                                    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