From a5280304e375cf843a00eae56bd58a2c72a8d1ef Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 일, 28 11월 2021 01:36:39 +0900
Subject: [PATCH] 이슈 상세 유형별 수정
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 2 +-
src/main/webapp/views/issueType/issueTypeAdd.html | 2 +-
src/main/webapp/views/issueType/issueTypeModify.html | 2 +-
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 20 +++++++++++++++++---
4 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 94947eb..a9c898c 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -36,7 +36,8 @@
removeDepartment : removeDepartment, // �떞�떦遺��꽌 �궘�젣
setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲�
startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
- containsPartner : containsPartner
+ containsPartner : containsPartner,
+ getPartners : getPartners
};
$scope.vm = {
@@ -314,8 +315,8 @@
function containsPartner(name) {
var result = false;
- if ($scope.vm.viewer.usePartnerVo != null) {
- $scope.vm.viewer.usePartnerVo.forEach(function (partnerVo) {
+ if ($scope.vm.partnerVos != null) {
+ $scope.vm.partnerVos.forEach(function (partnerVo) {
if (name === partnerVo.name) {
result = true;
}
@@ -755,6 +756,19 @@
}
}
+ function getPartners() {
+
+ HostingField.getPartnerList($resourceProvider.getContent(
+ {},
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+ if (result.data.message.status === "success") {
+ $scope.vm.partnerVos = result.data.content;
+ }
+ });
+
+ }
+
+
// 理쒖큹 �떎�뻾
function startExecute() {
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index abdc4fb..cdb0fce 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -386,7 +386,7 @@
var deferred = $q.defer();
- HostingField.getCompanyList($resourceProvider.getContent( // �럹�씠吏� �뾽�뜲�씠�듃媛� �븘�슂�븳 而댄룷�꼳�듃 �씪寃쎌슦, page �뾽�뜲�씠�듃媛� �엳�쓣 寃쎌슦 湲곕낯 10媛쒖뵫 媛��졇�삤怨� �븘�땺寃쎌슦 25媛쒖뵫 媛��졇�삩�떎.
+ HostingField.getPartnerList($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)) {
diff --git a/src/main/webapp/views/issueType/issueTypeAdd.html b/src/main/webapp/views/issueType/issueTypeAdd.html
index 3324204..e496304 100644
--- a/src/main/webapp/views/issueType/issueTypeAdd.html
+++ b/src/main/webapp/views/issueType/issueTypeAdd.html
@@ -63,7 +63,7 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.companies"
search="vm.companyName"
- source="fn.getCompanyList(vm.companyName, vm.form.companies)"
+ source="fn.getPartnerList(vm.companyName, vm.form.companies)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
diff --git a/src/main/webapp/views/issueType/issueTypeModify.html b/src/main/webapp/views/issueType/issueTypeModify.html
index 8c8fe27..ccf2123 100644
--- a/src/main/webapp/views/issueType/issueTypeModify.html
+++ b/src/main/webapp/views/issueType/issueTypeModify.html
@@ -68,7 +68,7 @@
<js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.companies"
search="vm.companyName"
- source="fn.getCompanyList(vm.companyName, vm.form.companies)"
+ source="fn.getPartnerList(vm.companyName, vm.form.companies)"
input-disabled="false"
translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
--
Gitblit v1.8.0