From e60f829f9d975a88673f0e6922f1c9c1228f89ea Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 금, 03 12월 2021 18:30:33 +0900 Subject: [PATCH] 사용자정의 필드 날짜 수정, 프로젝트 생성시 대쉬보드 이동 오류 수정 --- src/main/webapp/scripts/components/utils/autoComplete.controller.js | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js index 67227b9..004e327 100644 --- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js +++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js @@ -40,6 +40,7 @@ $scope.fn.getPartnerList = getPartnerList; // �뾽泥�/isp/�샇�뒪�똿 紐⑸줉 議고쉶 $scope.fn.getIssueTypeList = getIssueTypeList; // �씠�뒋 �쑀�삎 紐⑸줉 議고쉶 $scope.fn.getCustomFieldList = getCustomFieldList; // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 + $scope.fn.getMailTargetAll = getMailTargetAll; // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 function getUserList(query, excludeList, page, callBack) { var conditions = { @@ -64,7 +65,8 @@ }); return excludeIds; - })() + })(), + issueId : $rootScope.currentDetailIssueId }; var deferred = $q.defer(); @@ -125,9 +127,16 @@ return deferred.promise; } - function getIssueList(query, excludeList, page, callBack) { + function getIssueList(query, issueTypeId, excludeList, page, callBack) { var conditions = { name : query, + issueTypeIds : (function () { + var ids = []; + + ids.push(issueTypeId); + + return ids; + })(), excludeIds : (function () { var excludeIds = []; @@ -472,6 +481,25 @@ return deferred.promise; } + + function getMailTargetAll(excludeList) { + var deferred = $q.defer(); + + var partners = $scope.vm.partners.slice(); + if (excludeList != null && excludeList.length > 0) { + for (let i = partners.length - 1 ; i >= 0 ; i--) { + excludeList.forEach(function (exclude) { + if (partners[i].id === exclude.id) { + partners.splice(i, 1); + } + }); + } + } + + deferred.resolve(partners); + + return deferred.promise; + } } ]); } -- Gitblit v1.8.0