From 726b916d69be892a576ca5fba5d0334de1d8a6eb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 24 11월 2021 17:38:53 +0900
Subject: [PATCH] 연관이슈, 하위이슈 정보 추가 수정

---
 src/main/webapp/scripts/app/issue/issueList.controller.js |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 3b68c16..7a8041e 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -73,6 +73,7 @@
                     priorities : [],    //  �슦�꽑 �닚�쐞
                     severities : [],    //  以묒슂�룄
                     users : [], //  �떞�떦�옄
+                    departments : [], //  �떞�떦遺��꽌
                     registers : [], //  �벑濡앹옄
                     customFields : [],  //  �궗�슜�옄 �젙�쓽 �븘�뱶
                     issueTableConfigs : [],  //  �씠�뒋 �뀒�씠釉� �꽕�젙
@@ -103,6 +104,7 @@
                             search : $scope.vm.search,
                             projects : $scope.vm.projects,
                             users : $scope.vm.users,
+                            departments : $scope.vm.departments,
                             registers : $scope.vm.registers,
                             parentIssueId : $scope.vm.parentIssueId
                         })
@@ -130,9 +132,10 @@
                                 var issueListSearchObject = JSON.parse(result.data.data);
                                 //  �씠�뒋 踰덊샇留� �쟻�슜�븳�떎. - �궘�젣�떆 泥섎━諛⑸쾿�븣臾몄뿉 �떎瑜� �냽�꽦�� �쟻�슜 蹂대쪟
                                 $scope.vm.search = issueListSearchObject.search;
-                                /*$scope.vm.users = issueListSearchObject.users;
+                                $scope.vm.users = issueListSearchObject.users;
+                                $scope.vm.departments = issueListSearchObject.departments;
                                 $scope.vm.projects = issueListSearchObject.projects;
-                                $scope.vm.registers = issueListSearchObject.registers;*/
+                                $scope.vm.registers = issueListSearchObject.registers;
 
                                 $scope.fn.getPageList(0, true);
                             } else {
@@ -242,13 +245,13 @@
                                 .setDAlign("text-center")
                                 .setDName("issueTypeName"));
                             break;
-                        case "ASSIGNEETEAM" :   //  �떞�떦遺��꽌
+                        case "ASSIGNEE_TEAM" :   //  �떞�떦遺��꽌
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.assigneeTeam")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
-                                .setDRenderer("ISSUE_USER"));
+                                .setDRenderer("ISSUE_DEPARTMENT"));
                             break;
                         case "REGISTER" :   //  �벑濡앹옄
                             $scope.vm.tableConfigs.push($tableProvider.config()
@@ -376,6 +379,15 @@
                             });
 
                             return userIds;
+                        })(),
+                        departmentIds : (function () {
+                            var departmentIds = [];
+
+                            angular.forEach($scope.vm.departments, function (department) {
+                                departmentIds.push(department.id);
+                            });
+
+                            return departmentIds;
                         })(),
                         registerIds : (function () {
                             var registerIds = [];
@@ -869,7 +881,7 @@
                                     display : true
                                 }, {
                                     name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
-                                    key : "ASSIGNEETEAM",
+                                    key : "ASSIGNEE_TEAM",
                                     width : "width-140-p",
                                     position : 4,
                                     display : true

--
Gitblit v1.8.0