From e63b7471c64ee817629b3f89b4b3791b8a62ce48 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 15:23:24 +0900
Subject: [PATCH] 이슈 만들기 사용자정의 필드 수정

---
 src/main/webapp/scripts/app/issue/issueAdd.controller.js |   55 +++++++++++++++++++++++--------------------------------
 1 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 5fa436e..13089fa 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -132,13 +132,15 @@
 
                 //  �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦�옄 珥덇린�솕
                 $scope.$watch("vm.form.projects", function (newValue, oldValue) {
+
+
                     if (angular.isDefined(newValue)) {
                         if (newValue.length < 1) {
                             $scope.vm.form.users = [];
+                        } else {
+                            //  �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲�
+                            $scope.fn.getIssueTypeCustomFields();
                         }
-
-                        //  �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲�
-                        $scope.fn.getIssueTypeCustomFields();
                     }
                 });
 
@@ -686,9 +688,16 @@
 
                         if (result.data.message.status === "success") {
 
+                            $scope.vm.form.issueCustomFields = [];
                             angular.forEach(result.data.data, function (issueTypeCustomField) {
                                 switch (issueTypeCustomField.customFieldVo.customFieldType) {
                                     case "INPUT" :
+                                    case "NUMBER" :
+                                    case "DATETIME" :
+                                    case "IP_ADDRESS" :
+                                    case "EMAIL" :
+                                    case "SITE" :
+                                    case "TEL" :
                                         issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
                                         break;
                                     case "SINGLE_SELECT" :
@@ -705,30 +714,6 @@
                                                 });
                                             }
                                         });
-                                        break;
-
-                                    case "NUMBER" :
-                                        issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
-                                        break;
-
-                                    case "DATETIME" :
-                                        issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
-                                        break;
-
-                                    case "IP_ADDRESS" :
-                                        issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
-                                        break;
-
-                                    case "EMAIL" :
-                                        issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
-                                        break;
-
-                                    case "SITE" :
-                                        issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
-                                        break;
-
-                                    case "TEL" :
-                                        issueTypeCustomField.useValues = issueTypeCustomField.customFieldVo.defaultValue;
                                         break;
                                 }
 
@@ -786,8 +771,11 @@
                 }
 
                 function getPartners() {
+                    if($scope.vm.form.issueTypeId === ""){
+                        $scope.vm.form.issueTypeId = $rootScope.issueTypeMenu.id
+                    }
                     var content = {
-                        issueTypeId : $scope.vm.form.issueTypeId
+                        issueTypeId : $scope.vm.form.issueTypeId,
                     };
                     Issue.findPartners($resourceProvider.getContent(
                         content,
@@ -812,11 +800,14 @@
                         // �쁽�옱 �봽濡쒖젥�듃 �꽕�젙
                         if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
                             $scope.vm.projectName = $rootScope.workProject.name;
-                            $scope.fn.projects = [];
-                            $scope.fn.projects.push($rootScope.workProject);
-                            $scope.fn.getProjectList($scope.vm.projectName, $scope.vm.form.projects, $scope.vm.autoCompletePage.project.page, getStartProjectListCallback);
+                            $scope.vm.form.projects = [];
+                            $scope.vm.form.projects.push($rootScope.workProject);
                         }
-
+                        // �쁽�옱 �씠�뒋���엯 �쑀�삎 �꽕�젙
+                        var id = $rootScope.getCurrentIssueTypeId();
+                        if (id != null) {
+                            $scope.vm.form.issueTypeId = id.toString();
+                        }
                         $log.debug("promises 寃곌낵 ", results);
                     });
                 }

--
Gitblit v1.8.0