From 9ea4a2d0385d48a0713a5bbc3c1a8967e10baae1 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 20 12월 2021 11:00:50 +0900
Subject: [PATCH] 이슈 히스토리 하위이슈 문구 중복되는 문제 해결
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index a635489..5df19b9 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -990,7 +990,7 @@
``
function updateActiveHistory() {
$scope.vm.activeTab = 'ALL';
- //$scope.fn.makeActiveHistory();
+ $scope.fn.makeActiveHistory();
}
// �솢�룞 �씠�젰 留뚮뱾湲�
@@ -1000,14 +1000,19 @@
$scope.vm.viewer.activeParentHistory = "";
$scope.vm.viewer.activeDownHistory = "";
$scope.vm.viewer.activeDownAllHistory = "";
+ var downTitle = "";
// �븯�쐞�씠�뒋 �엳�뒪�넗由�
for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++){
- $scope.vm.viewer.activeDownHistory = $scope.vm.viewer.issueDownVos[i].issueHistoryVos.concat($scope.vm.viewer.issueDownVos[i+1].issueHistoryVos);
- 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;
+ }
}
for (var i=0; i<$scope.vm.viewer.activeDownHistory.length; i++){
- $scope.vm.viewer.activeDownHistory[i].description
- = "<div class='dot'>�븯�쐞�씠�뒋 : "+$scope.vm.viewer.activeDownHistory[i].title+"</div>" + $scope.vm.viewer.activeDownHistory[i].description;
+ 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;
}
$scope.vm.viewer.activeDownHistory.sort(function (a, b) { //�궡由쇱감�닚
return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
@@ -1015,13 +1020,13 @@
// �븯�쐞�씠�뒋 �뙎湲� �엳�뒪�넗由�
for (var i=0; i<$scope.vm.viewer.issueDownVos.length; i++) {
- $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos.concat($scope.vm.viewer.issueDownVos[i+1].issueCommentVos);
- 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++;
+ } else {
+ $scope.vm.viewer.downComment = $scope.vm.viewer.issueDownVos[i].issueCommentVos;
+ }
}
- /*for (var i=0; i<$scope.vm.viewer.downComment.length; i++){
- $scope.vm.viewer.downComment[i].description
- = $scope.vm.viewer.downComment[i].title +"�쓽 �뙎湲� : "+ $scope.vm.viewer.downComment[i].description;
- }*/
$scope.vm.viewer.issueDownVos.sort(function (a, b) { //�궡由쇱감�닚
return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
});
@@ -1031,8 +1036,12 @@
$scope.vm.viewer.activeHistory = $scope.vm.viewer.activeParentHistory.concat($scope.vm.viewer.activeDownAllHistory);
}else {
+ $scope.vm.viewer.activeParentHistory = $scope.vm.viewer.issueCommentVos.concat($scope.vm.viewer.issueHistoryVos);
$scope.vm.viewer.activeHistory = $scope.vm.viewer.issueCommentVos.concat($scope.vm.viewer.issueHistoryVos);
}
+ $scope.vm.viewer.activeParentHistory.sort(function (a, b) { //�궡由쇱감�닚
+ return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
+ });
$scope.vm.viewer.activeHistory.sort(function (a, b) { //�궡由쇱감�닚
return a.registerDate > b.registerDate ? -1 : a.registerDate < b.registerDate ? 1 : 0;
});
@@ -1087,7 +1096,6 @@
$timeout(function () {
SweetAlert.success($filter("translate")("common.deleteSucceeded"), result.data.message.message); // �궘�젣 �꽦怨�
}, 100);
-
$scope.fn.getCommentList();
}
else {
--
Gitblit v1.8.0