From 3571222dcf5f25b458b822fe888d695622144016 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 21:44:36 +0900
Subject: [PATCH] - 연관이슈, 하위이슈 추가 시 이슈타입 별 담당부서 불러오기 - 이슈 상세페이지에서 하위이슈 리스트에서 제거 시 팝업 문구 수정

---
 src/main/webapp/scripts/components/utils/autoComplete.controller.js |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 3712643..7fd4e7e 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -187,8 +187,12 @@
 
                     var deferred = $q.defer();
 
+                    if ($rootScope.isDefined(page) && page > 0) {
+                        $rootScope.spinner = true;
+                    }
+
                     Issue.find($resourceProvider.getContent(
-                        conditions)).then(function (result) {
+                        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);
@@ -198,6 +202,7 @@
                         else {
                             SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "�썙�겕�뵆濡쒖슦 紐⑸줉 議고쉶 �떎�뙣"
                         }
+                        $rootScope.spinner = false;
                     });
                     return deferred.promise;
                 }
@@ -227,8 +232,12 @@
                     };
                     var deferred = $q.defer();
 
+                    if ($rootScope.isDefined(page) && page > 0) {
+                        $rootScope.spinner = true;
+                    }
+
                     Issue.find($resourceProvider.getContent(         //  �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
-                        conditions)).then(function (result) {
+                        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);
@@ -238,6 +247,7 @@
                         else {
                             SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), result.data.message.message, "error"); // "�썙�겕�뵆濡쒖슦 紐⑸줉 議고쉶 �떎�뙣"
                         }
+                        $rootScope.spinner = false;
                     });
                     return deferred.promise;
                 }
@@ -308,7 +318,7 @@
 
                 function getIssueCompanyFieldList(query, excludeList, page, callBack) {
                     var conditions = {
-                        companyName : query,
+                        name : query,
                         excludeIds : (function () {
                             var excludeIds = [];
 
@@ -344,7 +354,7 @@
                 function getIssueDepartmentList(issueTypeId, query, excludeList, page, callBack) {
                     var conditions = {
                         //issueTypeId : $scope.vm.form.issueTypeId,
-                        issueTypeId : issueTypeId,
+                        issueTypeId : Number(issueTypeId),
                         departmentName : query,
                         userId : $rootScope.user.id,
                         projectId : (function () {

--
Gitblit v1.8.0