From 06e47101db331df85b8b35d22a926d2ce82d4ba9 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 22 12월 2021 09:27:17 +0900
Subject: [PATCH] 프로젝트 내에 이슈유형 없을시 사이드바에 표시
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 35 ++++++++++++++++++++++-------------
1 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 741a67b..197ce4d 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -130,7 +130,7 @@
});
// �긽�떒 寃��깋�떆
- $scope.$on("searchIssueList", function (event, args) {
+ $rootScope.$on("searchIssueList", function (event, args) {
$scope.vm.search.keyWord = args.keyWord;
$scope.fn.getPageList(0);
});
@@ -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,10 +1259,14 @@
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) {
+ getPageList(0,false,params.keyWord);
+ }else {
+ getDetailList(params.projectKey, params.issueNumber);
+ return;
+ }
$rootScope.previousGetParams = null;
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
- return;
}
var promises = {
--
Gitblit v1.8.0