From 6a0d01e645b7d388c851bc5b0b830564e60aa736 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 수, 01 12월 2021 16:44:28 +0900 Subject: [PATCH] 이메일 수정 진행중 , 이슈 상세 및 이슈 리스트 수정 --- src/main/webapp/scripts/components/utils/autoComplete.controller.js | 47 ++++++++++++----------------------------------- 1 files changed, 12 insertions(+), 35 deletions(-) diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js index 1b527bf..004e327 100644 --- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js +++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js @@ -482,44 +482,21 @@ return deferred.promise; } - function getMailTargetAll(query, excludeList, page, callBack) { - var conditions = { - id : query, - excludeIds : (function () { - var excludeIds = []; - - angular.forEach(excludeList, function (exclude) { - excludeIds.push(exclude.id); - }); - - return excludeIds; - })(), - partnersEmailIds : (function () { - var partnersEmailIds = []; - - angular.forEach($scope.vm.form.partners, function (partner) { - partnersEmailIds.push(partner.email); - }); - - return partnersEmailIds; - })(), - }; + function getMailTargetAll(excludeList) { var deferred = $q.defer(); - Issue.findMailTargetAll($resourceProvider.getContent( // �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎. - 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); + 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); + } + }); } - else { - SweetAlert.swal($filter("translate")("issue.failedToIssueTypeListLookup"), result.data.message.message, "error"); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣" - } - }); + } + + deferred.resolve(partners); return deferred.promise; } -- Gitblit v1.8.0