From 6adb341db180240e0af34ace40100912d4ed5257 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:02:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/scripts/app/issue/issueList.controller.js |   20 +++++++++++++++-----
 1 files changed, 15 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 256e3de..5915af6 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -183,9 +183,10 @@
                         }
                     });
                 }
+                $scope.vm.issueIds = [];
 
                 //  �긽�꽭 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
-                function changeDetailView(id) {
+                function changeDetailView(id, isBack = false) {
                     $scope.vm.tableConfigs = [];
                     $scope.vm.detailView = true;
 
@@ -196,6 +197,10 @@
                     //  �뀒�씠釉붿쓣 �떎�떆 洹몃┫�닔 �엳寃� �뜲�씠�꽣 諛붿씤�뵫�쓣 �떎�떆�븳�떎.
                     var temp = angular.copy($scope.vm.responseData.data);
                     $scope.vm.responseData.data = angular.copy(temp);
+
+                    if (!isBack) {
+                        $scope.vm.issueIds.push(id);
+                    }
                     //  �쁽�옱 �긽�꽭�솕硫댁쑝濡� 蹂대젮怨좏븯�뒗 �씠�뒋 id瑜� 湲곗뼲�븳�떎.
                     $rootScope.currentDetailIssueId = id;
                     //  �씠�뒋 �긽�꽭 �솕硫� �슂泥�
@@ -207,6 +212,7 @@
 
                 //  紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
                 function listView() {
+                    $scope.vm.issueIds = [];
                     $scope.vm.detailView = false;
                     //  �씠�뒋 �뀒�씠釉� �꽕�젙
                     $scope.fn.makeTableConfigs();
@@ -330,7 +336,7 @@
                         case "ISSUE_TITLE" :   //  �씠�뒋 �젣紐�
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("issue.issueTitle")
-                                .setDName("issueNumber") /* todo �씠嫄� ���씠��濡� 蹂�寃쏀빐�빞�븯�뒗�뜲*/
+                                .setDName("issueTitle")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -367,7 +373,7 @@
                         case "ASSIGNEE_TEAM" :   //  �떞�떦遺��꽌
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.assigneeTeam")
-                                .setDName("departmentName") /* todo 泥댄겕*/
+                                .setDName("departmentName")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -385,7 +391,6 @@
                         case "PERIOD" : //  湲곌컙
                             $scope.vm.tableConfigs.push($tableProvider.config()
                                 .setHName("common.period")
-                                .setDName("startDate")
                                 .setDType("renderer")
                                 .setHWidth("bold " + issueTableConfig.width)
                                 .setDAlign("text-center")
@@ -609,6 +614,7 @@
                     }
 
                     return conditions;
+
                 }
 
                 function getTreeList() {
@@ -711,7 +717,9 @@
                                     changeDetailView(result.data.data[0].id);
                                 }
                             } else {
-                                $scope.vm.responseData = result.data;
+                                // 媛믪씠 �뾾�쓣�븣 媛믪쓣 �꽔�뼱二쇰젮怨� �븯�뒗 �쓽�룄
+                                // $scope.vm.responseData = result.data;
+                                result.data = $scope.vm.responseData;
                             }
                         }
                         else {
@@ -1287,6 +1295,8 @@
 
                 //  理쒖큹 �떎�뻾
                 function startExecute() {
+                    // �씠�뒋 �긽�꽭�솕硫� �씠�뒋 �씠�룞 �궡�뿭 ���옣
+                    $scope.vm.issueIds = [];
                     // 荑좏궎 �씫湲�
                     var paramKeyWord = null;
 

--
Gitblit v1.8.0