From 6b700a86c5a74f58b904402bf990bdba8e9a4036 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 22:39:11 +0900
Subject: [PATCH] 뒤로가기 버튼 재 수정
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 10 +++++++++-
src/main/webapp/views/issue/issueDetail.html | 2 +-
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 9 +++++++--
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 5ea1f0a..d4906c2 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -126,13 +126,18 @@
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
//$rootScope.$broadcast("makeIssueSearch",issue);
$scope.$parent.tableEvent.changeDetailView(issue.id);
+
$scope.fn.onActivate();
}
// �긽�쐞 �씠�뒋 �겢由��떆 �긽�쐞 �씠�뒋濡� �씠�룞
function issueBack() {
- $rootScope.currentDetailIssueId = $scope.vm.viewer.parentIssueVo.id
- $rootScope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId});
+ var index = $scope.$parent.vm.issueIds.length -2;
+ if (index > -1) {
+ var preIssueId = $scope.$parent.vm.issueIds[index];
+ $scope.$parent.vm.issueIds.splice(index + 1, 1);
+ $scope.$parent.tableEvent.changeDetailView(preIssueId, true);
+ }
}
function onActivate() {
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index a4ffb6e..1efc5d7 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();
@@ -1288,6 +1294,8 @@
// 理쒖큹 �떎�뻾
function startExecute() {
+ // �씠�뒋 �긽�꽭�솕硫� �씠�뒋 �씠�룞 �궡�뿭 ���옣
+ $scope.vm.issueIds = [];
// 荑좏궎 �씫湲�
var paramKeyWord = null;
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 3306fed..75c7faf 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -109,7 +109,7 @@
<i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �뮘濡쒓�湲� 踰꾪듉 �깮�꽦 -->
-<!-- <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>-->
+ <span ng-if="vm.issueIds.length != 0 && vm.issueIds.length != 1" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �긽�꽭�솕硫� �떕湲곕쾭�듉 �쐞移� 議곗젙 -->
<span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="�긽�꽭 �솕硫� �떕湲�"></i></span>
</a>
--
Gitblit v1.8.0