From 7042c385c3579479367f0e710d1b92f4e3878a42 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 금, 03 12월 2021 17:40:53 +0900
Subject: [PATCH] - 버전 1.0으로 재정의(인터넷진흥원용 버전) - api 설정에 이슈타입 id, 사용자정의 필드 표시 하도록 수정
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 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..52e00e9 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});
}
// �씠�뒋 �뀒�씠釉� �꽕�젙
@@ -281,6 +283,13 @@
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setDName("modifyDate"));
+ break;
+ case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.countDownIssue")
+ .setHWidth("bold " + issueTableConfig.width)
+ .setDAlign("text-center")
+ .setDName("downIssueCount"));
break;
}
@@ -487,6 +496,7 @@
if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
var find = findProjectSearch($rootScope.workProject.id);
if (!find) {
+ $scope.vm.projects = [];
$scope.vm.projects.push($rootScope.workProject);
}
}
@@ -502,12 +512,38 @@
$scope.vm.issueTypeId = result.data.data[0].issueTypeId;
$scope.vm.projectKey = result.data.data[0].projectKey;
$scope.vm.issueNumber = result.data.data[0].issueNumber;
+ $scope.vm.projectName = result.data.data[0].projectName;
$scope.vm.page.selectedPage = currentPage + 1;
$scope.vm.responseData = result.data;
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 +921,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