From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index fe9dc27..7c348ac 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -169,10 +169,11 @@
// �쁽�옱 �긽�꽭�솕硫댁쑝濡� 蹂대젮怨좏븯�뒗 �씠�뒋 id瑜� 湲곗뼲�븳�떎.
$rootScope.currentDetailIssueId = id;
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
- $rootScope.$broadcast("getIssueDetail", {
- id : id
- });
+ // $scope.$broadcast("getIssueDetail", {
+ // id : id
+ // });
}
+
// 紐⑸줉 �솕硫댁쑝濡� 蹂�寃쏀븳�떎.
function listView() {
@@ -183,6 +184,7 @@
$scope.vm.responseData.data = angular.copy(temp);
// 留덉�留됱쑝濡� 蹂닿퀬�엳�뜕 �씠�뒋 id瑜� 珥덇린�솕�븳�떎.
$rootScope.currentDetailIssueId = null;
+ $scope.$broadcast("getIssueList", {id: $rootScope.currentDetailIssueId});
}
// �씠�뒋 �뀒�씠釉� �꽕�젙
@@ -508,6 +510,31 @@
if (detail) {
changeDetailView(result.data.data[0].id);
}
+ }
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
+ }
+ });
+ }
+
+ // �씠硫붿씪 �봽濡쒖젥�듃 寃쎈줈濡� �씠�룞 �썑 �긽�꽭 吏꾩엯�떆 議고쉶
+ function getDetailList(projectKey, number) {
+ var conditions = {
+ projectKey : projectKey,
+ combinationIssueNumber : number
+ };
+
+ Issue.find($resourceProvider.getContent(conditions,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ if (result.data.data != null && result.data.data.length > 0) {
+ $scope.vm.projectKey = result.data.data[0].projectKey;
+ $scope.vm.issueNumber = result.data.data[0].issueNumber;
+ $scope.vm.responseData = result.data;
+
+ changeDetailView(result.data.data[0].id);
}
}
else {
@@ -885,7 +912,8 @@
// �뙆�씪誘명꽣 �씫湲�
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
- $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
+ // $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
+ getDetailList(params.projectKey, params.issueNumber);
$rootScope.previousGetParams = null;
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
return;
--
Gitblit v1.8.0