From 916a3cbabe4e50062fce61ff6f2f5d46c05dfbd1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 17 3월 2022 17:47:45 +0900
Subject: [PATCH] - api로 이슈 추가 시 url/ip로 업체 찾는 코드 수정

---
 src/main/webapp/scripts/app/project/projectCustomFieldConfig.controller.js |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/scripts/app/project/projectCustomFieldConfig.controller.js b/src/main/webapp/scripts/app/project/projectCustomFieldConfig.controller.js
index 58f20f5..b488f65 100644
--- a/src/main/webapp/scripts/app/project/projectCustomFieldConfig.controller.js
+++ b/src/main/webapp/scripts/app/project/projectCustomFieldConfig.controller.js
@@ -24,19 +24,21 @@
 
                 $scope.vm = {
                     form : {
-                        issueTypeId : ""
+                        issueTypeId : "",
+                        useValue : ""
                     },
                     issueTypes : [],
                     originCustomFields : [],
                     customFields : [],
-                    relationCustomFields : []
+                    relationCustomFields : [],
+                    useValues : []
                 };
 
                 //  �씠�뒋 �쑀�삎 紐⑸줉�쓣 媛��졇�삩�떎.
                 function getIssueTypes() {
                     var deferred = $q.defer();
 
-                    IssueType.find($resourceProvider.getContent({},
+                    IssueType.find($resourceProvider.getContent({projectId : parameter.id},
                         $resourceProvider.getPageContent(0, 1000))).then(function (result) {
 
                         if (result.data.message.status === "success") {
@@ -92,12 +94,18 @@
                         $resourceProvider.getPageContent(0, 0))).then(function (result) {
 
                         if (result.data.message.status === "success") {
+
                             //  �솕硫댁뿉�꽌 �씠由꾩쓣 �몴�떆�븯湲� �쐞�빐 �궗�슜�옄 �젙�쓽 �븘�뱶 紐낆쓣 name �뿉 �뀑�똿�븳�떎.
                             angular.forEach(result.data.data, function (issueTypeCustomField) {
                                 var relationCustomField = angular.copy(issueTypeCustomField.customFieldVo);
                                 relationCustomField.checked = issueTypeCustomField.fieldOption == '01';    //  �븘�닔 媛� �뿬遺�
                                 $scope.vm.relationCustomFields.push(relationCustomField);
+
+                                for (var i=0; i < result.data.data.length; i++){
+                                    $scope.vm.useValues.push(result.data.data[i].useValue)
+                                }
                             });
+
 
                             angular.forEach($scope.vm.originCustomFields, function (originCustomField) {
                                 var search = false;
@@ -144,6 +152,7 @@
                     $rootScope.spinner = true;
 
                     var content = {
+                        useValues : $scope.vm.useValues,
                         projectId : parameter.id,
                         issueTypeId : $scope.vm.form.issueTypeId,
                         relationCustomFields : $scope.vm.relationCustomFields
@@ -152,6 +161,9 @@
                     IssueTypeCustomField.modify($resourceProvider.getContent(
                         content,
                         $resourceProvider.getPageContent(0, 10))).then(function (result) {
+                        if ($scope.vm.useValues === false) {
+                            alert("�씠誘� �궗�슜以묒씤 �븘�뱶 �엯�땲�떎.")
+                        }
 
                         if (result.data.message.status === "success") {
                             SweetAlert.success($filter("translate")("project.saveCompleteFieldManagement"), $filter("translate")("project.saveUserDefinedFieldAndIssueTypeConnection")); // "�븘�뱶 愿�由� ���옣 �셿猷�", "�궗�슜�옄 �젙�쓽 �븘�뱶�� �씠�뒋 ���엯 �뿰寃� �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎."

--
Gitblit v1.8.0