From c324b3949406123cbeb323c180857d57712b945e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 27 12월 2021 16:41:53 +0900
Subject: [PATCH] 사용자 정의 필드 필수 항목 표시 변경 롤백 (jquery로 pattern 조건 변경 예정)
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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..834a91d 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 = [];
--
Gitblit v1.8.0