From c7a853d0932a11cb3869ff72520e79d69a9ed853 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 15:53:56 +0900
Subject: [PATCH] 이슈 상단검색 진행중
---
src/main/webapp/scripts/config.js | 10 +++++-----
src/main/webapp/scripts/app/common/common.controller.js | 2 +-
src/main/webapp/scripts/app/issue/issueList.controller.js | 8 ++++++--
3 files changed, 12 insertions(+), 8 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..70f779a 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -73,7 +73,7 @@
$state.go("issues.list");
}
- $scope.$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 5ce58c6..ac4cece 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -129,7 +129,7 @@
});
// �긽�떒 寃��깋�떆
- $scope.$on("searchIssueList", function (event, args) {
+ $rootScope.$on("searchIssueList", function (event, args) {
$scope.vm.search.keyWord = args.keyWord;
$scope.fn.getPageList(0);
});
@@ -1252,7 +1252,11 @@
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
// $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
- getDetailList(params.projectKey, params.issueNumber);
+ // if (params.keyWord != null) {
+ // getIssueList(params.keyWord);
+ // }else {
+ getDetailList(params.projectKey, params.issueNumber);
+ //}
$rootScope.previousGetParams = null;
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
return;
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 3622771..80eab3a 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -521,11 +521,6 @@
$("#page-container").trigger("click");
$("body").unbind("click");
- // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━
- if ($rootScope.isMainSearch) {
- $rootScope.isMainSearch = false;
- }
-
var $uibModalStack = $injector.get('$uibModalStack');
$uibModalStack.dismissAll();
@@ -574,6 +569,11 @@
$rootScope.checkPrimaryWorkspace();
}
}
+
+ // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━
+ if ($rootScope.isMainSearch) {
+ $rootScope.isMainSearch = false;
+ }
});
// if ui-router $http occur error, trigger this event
--
Gitblit v1.8.0