From a75bcc7c2b0fc98bd3a8abc100a4ad4ec11b9c26 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 15:54:35 +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 |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 39c3976..3ca4ae2 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -36,13 +36,6 @@
                     }
                 };
 
-                //  session check after route
-                $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
-                    if (!$rootScope.isMainSearch) {
-                        $scope.vm.searchAll.keyWord = "";
-                    }
-                });
-
                 //  �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
                 $scope.$on("makeIssueSearch", function (event, args) {
                     //  �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
@@ -65,15 +58,22 @@
                     //}
                 });
 
+                $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
+                    var keyWord = $rootScope.getCookie("searchKeyword");
+
+                    if (keyWord == null || keyWord === '') {
+                        $scope.vm.searchAll.keyWord = "";
+                    }
+                });
+
                 // 硫붿씤 �긽�떒 寃��깋
                 function searchAll() {
-                    $rootScope.isMainSearch = true;
-
-                    if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
-                        $state.go("issues.list");
+                    if ($rootScope.isDefined($scope.vm.searchAll.keyWord)) {
+                        $rootScope.setCookie("searchKeyword", $scope.vm.searchAll.keyWord, 60000);
+                        moveMenu("issues.list");
+                    } else {
+                        SweetAlert.warning($filter("translate")("common.alertSystem"), $filter("translate")("issue.pleaseEnterIssueKeyWord"));
                     }
-
-                    $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
                 }
 
                 function setLastIssueType() {

--
Gitblit v1.8.0