From 3f45ec1851bf75f10b1cacf9d5ead89f875d3217 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 14:03:50 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/scripts/app/common/common.controller.js |   47 ++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 4216e9c..c9fa6ee 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -23,21 +23,30 @@
                     moveMenu : moveMenu,
                     findIssueList : findIssueList,   // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
                     changeIssueListMenu : changeIssueListMenu,
-                    setLastIssueType : setLastIssueType
+                    setLastIssueType : setLastIssueType,
+                    searchAll : searchAll       // �긽�떒 寃��깋
                 };
 
                 $scope.vm = {
                     workProject : -1,
                     message: "",
-                    workProjectId : -1
+                    workProjectId : -1,
+                    searchAll : {
+                        keyWord : ""
+                    }
                 };
 
-
+                //  session check after route
+                $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
+                    if (!$rootScope.isMainSearch) {
+                        $scope.vm.searchAll.keyWord = "";
+                    }
+                });
 
                 //  �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
                 $scope.$on("makeIssueSearch", function (event, args) {
                     //  �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
-                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
+                    $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber, args.issueTypeId);
                 });
 
                 // �씠�뒋 �쑀�삎 蹂�寃쎌떆
@@ -51,10 +60,21 @@
                 });
 
                 $scope.$on("changedLastProject", function () {
-                    if ($rootScope.workProject != null) {
+                    //if ($rootScope.workProject != null) {
                         $scope.fn.findIssueList($rootScope.workProject.id);
-                    }
+                    //}
                 });
+
+                // 硫붿씤 �긽�떒 寃��깋
+                function searchAll() {
+                    $rootScope.isMainSearch = true;
+
+                    if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
+                        $state.go("issues.list");
+                    }
+
+                    $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
+                }
 
                 function setLastIssueType() {
                     if (User != null) {
@@ -80,6 +100,8 @@
 
                     // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
                     if (changeProject) {
+
+                        $rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
                         $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
 
                         if ($rootScope.issueTypeMenu != null) {
@@ -87,12 +109,10 @@
                         }
                     }
                     //moveMenu("issues.list");
-                    //$rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
 
                     if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
                         $scope.fn.setLastIssueType(issueTypeId);
                     }
-
                 }
 
                 function moveMenu(stateName) {
@@ -116,7 +136,7 @@
                 }
 
                 //  �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
-                function makeIssueSearch(projectKey, issueNumber) {
+                function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
                     var combinationIssueNumber = projectKey;
                     if (issueNumber != undefined) {
                         combinationIssueNumber += "-" + issueNumber;
@@ -134,6 +154,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); // "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣"
@@ -184,9 +205,9 @@
                                     }
 
                                     var id = $rootScope.workProject.id === -1 ? null : $rootScope.workProject.id;
-                                    $scope.fn.findIssueList(id);
                                 }
                                 $rootScope.projects = datas;
+                                $scope.fn.findIssueList(id);
                             }
 
                             if ($rootScope.user.lastProjectId == null) {
@@ -241,6 +262,10 @@
 
                 // �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
                function findIssueList(projectId) {
+
+                    if ($rootScope.projects == null || $rootScope.projects.length <= 1)
+                        return;
+
                    //  �씠�뒋 ���엯 紐⑸줉 寃��깋 議곌굔�쓣 留뚮뱺�떎.
                    var conditions = {
                        projectId : projectId > -1 ? projectId : null,
@@ -260,7 +285,7 @@
                                    if (issueType.id === $rootScope.user.lastIssueTypeId) {
                                        selectIssueTypeId = issueType.id;
                                        $scope.fn.changeIssueListMenu(issueType.id, false);
-                                       $state.go('dashboards.dashboard');
+                                       // $state.go('dashboards.dashboard');
                                    }
 
                                    if (selectIssueTypeId == null) {

--
Gitblit v1.8.0