From b070c969c3aef01166d59d7f8aa0159f5facb0f9 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 30 11월 2021 16:12:56 +0900
Subject: [PATCH] 사용자 정의 필드 관련 수정

---
 src/main/webapp/scripts/app/issue/issueList.controller.js |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index dd3880b..fe9dc27 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -45,6 +45,7 @@
                     issueTypeId : "",
                     partnerVos : "",
                     search : {
+                        keyWord : "", //  �쟾泥� 寃��깋
                         title : "", //  �젣紐�
                         description : "",   //  �궡�슜
                         combinationIssueNumber : "",   //  �씠�뒋 踰덊샇
@@ -102,6 +103,7 @@
                 });
 
                 //  寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
+                //  寃��깋 議곌굔�쓣 湲곗뼲�빐�꽌 �씠�뒋 �긽�꽭 �럹�씠吏�濡� �씠�룞
                 function makeVmSearchObject() {
                     var content = {
                         conditions : JSON.stringify({
@@ -136,10 +138,10 @@
                                 var issueListSearchObject = JSON.parse(result.data.data);
                                 //  �씠�뒋 踰덊샇留� �쟻�슜�븳�떎. - �궘�젣�떆 泥섎━諛⑸쾿�븣臾몄뿉 �떎瑜� �냽�꽦�� �쟻�슜 蹂대쪟
                                 $scope.vm.search = issueListSearchObject.search;
-                                $scope.vm.users = issueListSearchObject.users;
-                                $scope.vm.departments = issueListSearchObject.departments;
-                                $scope.vm.projects = issueListSearchObject.projects;
-                                $scope.vm.registers = issueListSearchObject.registers;
+                                // $scope.vm.users = issueListSearchObject.users;
+                                // $scope.vm.departments = issueListSearchObject.departments;
+                                // $scope.vm.projects = issueListSearchObject.projects;
+                                // $scope.vm.registers = issueListSearchObject.registers;
 
                                 $scope.fn.getPageList(0, true);
                             } else {
@@ -320,6 +322,7 @@
                 //  �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
                 function makeSearchConditions() {
                     var conditions = {
+                        keyWord : $scope.vm.search.keyWord,
                         title : $scope.vm.search.title,
                         description : $scope.vm.search.description,
                         projectType : $scope.vm.search.projectType,
@@ -497,6 +500,8 @@
                         if (result.data.message.status === "success") {
                             if (result.data.data !=  null && result.data.data.length > 0) {
                                 $scope.vm.issueTypeId = result.data.data[0].issueTypeId;
+                                $scope.vm.projectKey = result.data.data[0].projectKey;
+                                $scope.vm.issueNumber = result.data.data[0].issueNumber;
                                 $scope.vm.page.selectedPage = currentPage + 1;
                                 $scope.vm.responseData = result.data;
 
@@ -590,7 +595,7 @@
                         resolve : {
                             parameter : function () {
                                 return {
-                                    id : id
+                                    id : id,
                                 };
                             }
                         }
@@ -823,6 +828,12 @@
                             angular.forEach(result.data.data, function (customField) {
                                 switch (customField.customFieldType) {
                                     case "INPUT" :
+                                    case "NUMBER" :
+                                    case "DATETIME" :
+                                    case "IP_ADDRESS" :
+                                    case "EMAIL" :
+                                    case "SITE" :
+                                    case "TEL" :
                                         customField.useValues = "";
                                         break;
 
@@ -830,6 +841,7 @@
                                     case "SINGLE_SELECT" :
                                         customField.useValues = [];
                                         break;
+
                                 }
 
                                 $scope.vm.customFields.push(customField);
@@ -867,6 +879,7 @@
 
                     return deferred.promise;
                 }
+
                 //  理쒖큹 �떎�뻾
                 function startExecute() {
                     // �뙆�씪誘명꽣 �씫湲�
@@ -874,7 +887,7 @@
                     if ($rootScope.isDefined(params)) {
                         $rootScope.$broadcast("makeIssueSearch", {  projectKey : params.projectKey, issueNumber : params.issueNumber });
                         $rootScope.previousGetParams = null;
-                        $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
+                        // $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
                         return;
                     }
 

--
Gitblit v1.8.0