From 56ae1cd12a7a3a92563bcbf5583f659c5ad5eee5 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 15:42:59 +0900
Subject: [PATCH] - 상위 이슈 검색시 하위 이슈는 검색 제외 및 프로젝트 설정 해야 상위이슈 선택 가능하도록 수정
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 9e39aa1..a2e3381 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -33,6 +33,7 @@
$scope.fn.getUserList = getUserList; // �궗�슜�옄 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getProjectList = getProjectList; // �봽濡쒖젥�듃 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getIssueList = getIssueList; // �씪媛� 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
+ $scope.fn.getParentIssueList = getParentIssueList; // �긽�쐞 �씠�뒋 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getRelIssueList = getRelIssueList; // �뿰愿� �씠�뒋 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getDownIssueList = getDownIssueList; // �븯�쐞 �씠�뒋 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
$scope.fn.getWorkflowList = getWorkflowList; // �썙�겕�뵆濡쒖슦 紐⑸줉 �젙蹂대�� 議고쉶�븳�떎.
@@ -175,7 +176,7 @@
return deferred.promise;
}
- function getRelIssueList(query, issueTypeId, excludeList, page, callBack) {
+ function getParentIssueList(query, issueTypeId, excludeList, page, callBack) {
var conditions = {
name : query,
excludeIds : (function () {
@@ -210,6 +211,52 @@
return deferred.promise;
}
+ function getRelIssueList(parentYN, project, query, issueTypeId, excludeList, page, callBack) {
+ var conditions = {
+ name : query,
+ excludeIds : (function () {
+ var excludeIds = [];
+
+ angular.forEach(excludeList, function (exclude) {
+ excludeIds.push(exclude.id);
+ });
+ return excludeIds;
+ })(),
+ parentYN : parentYN,
+ projectIds : (function () {
+ var projectIds = [];
+ if (project != null) {
+ if (project.length < 1) {
+ SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), $filter("translate")("common.selectToProjectListLookUp"), "error"); // "�봽濡쒖젥�듃瑜� 癒쇱� �꽑�깮 �빐 二쇱꽭�슂."
+ }
+ projectIds.push(project[0].id);
+ }
+ return projectIds;
+ })()
+ };
+
+ var deferred = $q.defer();
+
+ if ($rootScope.isDefined(page) && page > 0) {
+ $rootScope.spinner = true;
+ }
+
+ Issue.find($resourceProvider.getContent(
+ conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
+ if (result.data.message.status === "success") {
+ if ($rootScope.isDefined(callBack)) {
+ callBack(result);
+ }
+ deferred.resolve(result.data.data);
+ }
+ else {
+ SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "�썙�겕�뵆濡쒖슦 紐⑸줉 議고쉶 �떎�뙣"
+ }
+ $rootScope.spinner = false;
+ });
+ return deferred.promise;
+ }
+
function getDownIssueList(query, issueTypeId, parentIssueId, excludeList, page, callBack) {
var conditions = {
name : query,
--
Gitblit v1.8.0