From c548c19c957c67589da8e0092cefcc68a79343b5 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 09 12월 2021 09:44:17 +0900
Subject: [PATCH] - 자동 종료 설정 오류 수정
---
src/main/webapp/scripts/app/api/apiSetting.controller.js | 54 ++++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index fc6730e..acb070f 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -140,7 +140,7 @@
});
}
- $scope.$watch("vm.issueTypeId", function (newValue){
+ $scope.$watch("vm.issueTypeId", function (newValue, oldValue){
if (newValue != null && newValue !== "") {
$scope.fn.loadPage();
}
@@ -189,7 +189,6 @@
}
function onChangeIssueTypeOverlap() {
- $scope.fn.getIssueStatuses();
$scope.fn.getIssueTypeCustomFields();
$scope.fn.getOverlapList();
}
@@ -237,8 +236,6 @@
if (result.data.message.status === "success") {
SweetAlert.swal($filter("translate")("api.successToApiAutoCompleteIssueStatus"), result.data.message.message, "success"); // "�꽕�젙 �꽦怨�"
$scope.fn.getIssueTypes();
- $scope.fn.getIssueStatuses();
- $scope.fn.getIssueTypeCustomFields();
} else {
SweetAlert.swal($filter("translate")("api.failedToApiAutoCompleteIssueStatus"), result.data.message.message, "error"); // "�꽕�젙 �떎�뙣"
}
@@ -403,6 +400,7 @@
if (tab === "API_COL_SETTING") {
$scope.fn.onChangeColumnSetting();
} else if (tab === "API_OVERLAP_SETTING") {
+ $scope.fn.getIssueStatuses();
$scope.fn.onChangeIssueTypeOverlap();
} else if (tab === "API_SPEC_SETTING") {
$scope.fn.onChangeIssueTypeSpec();
@@ -410,44 +408,48 @@
}
$scope.$on("getIssueStatusComplete", function (event, args){
- if ($scope.vm.issueStatuses != null) {
- $scope.vm.completeIssueStatuses = [];
+ if ($scope.vm.tab === "API_OVERLAP_SETTING") {
+ if ($scope.vm.issueStatuses != null) {
+ $scope.vm.completeIssueStatuses = [];
- $scope.vm.issueStatuses.forEach(function (issueStatus) {
- if (issueStatus.issueStatusType === "CLOSE") {
- $scope.vm.completeIssueStatuses.push(issueStatus);
- }
- });
-
- // �꽕�젙�맂 �긽�깭 吏��젙
- $scope.vm.completeIssueStatusId = "";
- let issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
- if (issueTypeVo.completeIssueStatusVo != null) {
- $scope.vm.completeIssueStatuses.forEach(function (issueStatus) {
- if (issueStatus.id === issueTypeVo.completeIssueStatusVo.id) {
- $scope.vm.completeIssueStatusId = issueStatus.id.toString();
+ $scope.vm.issueStatuses.forEach(function (issueStatus) {
+ if (issueStatus.issueStatusType === "CLOSE") {
+ $scope.vm.completeIssueStatuses.push(issueStatus);
}
});
+
+ // �꽕�젙�맂 �긽�깭 吏��젙
+ $scope.vm.completeIssueStatusId = "";
+ let issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
+ if (issueTypeVo.completeIssueStatusVo != null) {
+ $scope.vm.completeIssueStatuses.forEach(function (issueStatus) {
+ if (issueStatus.id === issueTypeVo.completeIssueStatusVo.id) {
+ $scope.vm.completeIssueStatusId = issueStatus.id.toString();
+ }
+ });
+ }
}
}
});
function getIssueStatuses() {
var condition = {
- issueTypeId : $scope.vm.issueTypeId
+ issueTypeId: $scope.vm.issueTypeId
}
IssueStatus.findIssueStatusesByIssueType($resourceProvider.getContent(condition,
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status === "success") {
$scope.vm.issueStatuses = result.data.data;
- $scope.vm.issueStatusId = "";
- if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) {
- $scope.vm.issueStatusId = $scope.vm.issueStatuses[0].id.toString();
+
+ // $scope.vm.issueStatusId = "";
+ if ($scope.vm.issueTypeId === "") {
+ if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) {
+ $scope.vm.issueStatusId = $scope.vm.issueStatuses[0].id.toString();
+ }
}
$scope.$broadcast("getIssueStatusComplete", $scope.vm.issueStatuses);
- }
- else {
+ } else {
SweetAlert.swal($filter("translate")("issue.failedToCriticalListLookup"), result.data.message.message, "error"); // 以묒슂�룄 紐⑸줉 議고쉶 �떎�뙣
}
});
@@ -461,6 +463,7 @@
function onChangeIssueTypeSpec() {
+ $scope.fn.getIssueStatuses();
$scope.fn.getIssueTypeCustomFields();
}
@@ -496,7 +499,6 @@
var jsonData = {
token: "||諛쒓툒諛쏆� �넗�겙||",
- title: "||�씠�뒋 �젣紐�||",
issueTypeId: $scope.vm.issueTypeId,
apiType: "modify",
issueStatusId: $scope.vm.issueStatusId,
--
Gitblit v1.8.0