From 8c9fe9cf7890c0360672b8cd6924c76f11452006 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 20 12월 2021 17:00:01 +0900
Subject: [PATCH] - 이슈상세에서 하위이슈 추가 검색시 상위 이슈는 검색 리스트에서 제외 - 이슈상세에서 연관 이슈/하위 이슈 리스트 전체 불러오기(10개이상 스크롤) - 이슈추가,수정 시 파트너 정보 불러오기 수정 - 하위이슈 히스토리 코드 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index a6c9c90..37fadd0 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -55,7 +55,7 @@
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {}; // �쁽�옱 �씠�뒋
$scope.vm.images = []; // 泥⑤��맂 �뙆�씪 以� �씠誘몄� �뙆�씪
- $scope.vm.activeTab = "ALL"; // �솢�룞 �궡�뿭 �꺆
+ $scope.vm.activeTab = "RECODE"; // �솢�룞 �궡�뿭 �꺆
// �씠�뒋 �긽�깭 蹂�寃� �몴�떆 �뿬遺�
$scope.vm.editor = {
issueStatus : false
@@ -1000,16 +1000,24 @@
$scope.vm.viewer.activeParentHistory = "";
$scope.vm.viewer.activeDownHistory = "";
$scope.vm.viewer.activeDownAllHistory = "";
+ $scope.vm.viewer.downComment = "";
var downTitle = "";
+ var oriDownHistory = [];
+ var oriDownCommentHistory = [];
+
// �븯�쐞�씠�뒋 �엳�뒪�넗由�
for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++){
- if($scope.vm.viewer.issueDownVos.length > 1){
- $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos.concat($scope.vm.viewer.issueDownVos[i+1].issueHistoryVos);
- i++;
- }else {
- $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos;
+ oriDownHistory.push($scope.vm.viewer.issueDownVos[i].issueHistoryVos);
+ oriDownCommentHistory.push($scope.vm.viewer.issueDownVos[i].issueCommentVos);
+ }
+ for (var i=0; i<oriDownHistory.length; i++){
+ if ($scope.vm.viewer.activeDownHistory === "") {
+ $scope.vm.viewer.activeDownHistory = oriDownHistory[i];
+ } else {
+ $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.activeDownHistory.concat(oriDownHistory[i]);
}
}
+
for (var i=0; i<$scope.vm.viewer.activeDownHistory.length; i++){
downTitle = "<div class='dot' style='margin-bottom: -8px'>*�븯�쐞�씠�뒋 : "+$scope.vm.viewer.activeDownHistory[i].title+"</div>";
$scope.vm.viewer.activeDownHistory[i].desc = downTitle + $scope.vm.viewer.activeDownHistory[i].description;
@@ -1019,12 +1027,11 @@
});
// �븯�쐞�씠�뒋 �뙎湲� �엳�뒪�넗由�
- for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++) {
- if($scope.vm.viewer.issueDownVos.length > 1){
- $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos.concat($scope.vm.viewer.issueDownVos[i+1].issueCommentVos);
- i++;
+ for (var i=0; i<oriDownCommentHistory.length; i++) {
+ if ($scope.vm.viewer.downComment === "") {
+ $scope.vm.viewer.downComment = oriDownCommentHistory[i];
} else {
- $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos;
+ $scope.vm.viewer.downComment = $scope.vm.viewer.downComment.concat(oriDownCommentHistory[i]);
}
}
$scope.vm.viewer.issueDownVos.sort(function (a, b) { //�궡由쇱감�닚
--
Gitblit v1.8.0