From 4c3e2d80a26559ff44f0e4063823f173dafa1f25 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 21 12월 2021 17:55:42 +0900
Subject: [PATCH] 통합검색 수정
---
src/main/webapp/scripts/config.js | 7 ---
src/main/webapp/scripts/app/issue/issueManager.controller.js | 7 ++-
src/main/webapp/scripts/app/common/common.controller.js | 18 +++------
src/main/webapp/scripts/app/issue/issueList.controller.js | 35 ++++++++++-------
4 files changed, 31 insertions(+), 36 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 70f779a..e1c0035 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) {
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
@@ -67,13 +60,14 @@
// 硫붿씤 �긽�떒 寃��깋
function searchAll() {
- $rootScope.isMainSearch = true;
-
- if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
- $state.go("issues.list");
+ if ($state.current.name !== "issues.list") {
+ // $state.go("issues.list");
+ var myUrl = window.location.href.split('#/');
+ location.href = myUrl[0] + "#/issues/issueList?keyWord=" + $scope.vm.searchAll.keyWord;
+ } else {
+ $rootScope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
}
- $rootScope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
}
function setLastIssueType() {
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index d653831..197ce4d 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -591,10 +591,14 @@
}
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
- function getPageList(selectedPage, detail = false) {
+ function getPageList(selectedPage, detail = false, keyWord = "") {
$rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
if (selectedPage < 0) {
selectedPage = 0;
+ }
+
+ if (keyWord !== "") {
+ $scope.vm.search.keyWord = keyWord;
}
if ($scope.vm.hideCompleteIssue) {
@@ -618,7 +622,7 @@
// 寃��깋 湲곕낯媛� �꽭�똿
$scope.vm.search.issueTypeIds = [];
$scope.vm.projects = [];
- if (!$rootScope.isMainSearch) {
+ if ($scope.vm.search.keyWord == null || $scope.vm.search.keyWord === "") {
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
if ($rootScope.issueTypeMenu != null) {
//$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
@@ -627,18 +631,19 @@
fieldKey: $rootScope.issueTypeMenu.id,
fieldValue: $rootScope.issueTypeMenu.name
});
- }
- // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
- //$scope.fn.makeVmSearchObject();
+ // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
+ //$scope.fn.makeVmSearchObject();
- // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
- if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
- var find = findProjectSearch($rootScope.workProject.id);
- if (!find) {
- $scope.vm.projects.push($rootScope.workProject);
+ // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
+ var find = findProjectSearch($rootScope.workProject.id);
+ if (!find) {
+ $scope.vm.projects.push($rootScope.workProject);
+ }
}
}
+
}
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
@@ -1254,14 +1259,14 @@
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
// $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
- // if (params.keyWord != null) {
- // getIssueList(params.keyWord);
- // }else {
+ if (params.keyWord != null) {
+ getPageList(0,false,params.keyWord);
+ }else {
getDetailList(params.projectKey, params.issueNumber);
- //}
+ return;
+ }
$rootScope.previousGetParams = null;
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
- return;
}
var promises = {
diff --git a/src/main/webapp/scripts/app/issue/issueManager.controller.js b/src/main/webapp/scripts/app/issue/issueManager.controller.js
index ca7cac7..b03c0cf 100644
--- a/src/main/webapp/scripts/app/issue/issueManager.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueManager.controller.js
@@ -47,9 +47,12 @@
});
// �긽�떒 寃��깋�떆
- $scope.$on("searchIssueList", function (event, args) {
+ if ($rootScope.previousGetParams != null && $rootScope.previousGetParams.keyWord != null && $rootScope.previousGetParams.keyWord !== "") {
$scope.vm.pageTitle = $filter("translate")("issue.searchIssue");
- });
+ }
+ /*$scope.$on("searchIssueList", function (event, args) {
+ $scope.vm.pageTitle = $filter("translate")("issue.searchIssue");
+ });*/
function start() {
if ($rootScope.issueTypeMenu != null) {
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 80eab3a..46524b3 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -73,9 +73,6 @@
// 理쒓퀬愿�由ъ옄 議댁옱 �뿬遺�
$rootScope.hasSuperUser = false;
- // 硫붿씤 寃��깋 �뿬遺�
- $rootScope.isMainSearch = false;
-
// ���떆蹂대뱶 �꽑�깮 0:�쟾泥� 1:�봽濡쒖젥�듃
$rootScope.dashboard = 0;
@@ -570,10 +567,6 @@
}
}
- // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━
- if ($rootScope.isMainSearch) {
- $rootScope.isMainSearch = false;
- }
});
// if ui-router $http occur error, trigger this event
--
Gitblit v1.8.0