From 686a943baa3f2af685881a6ad05c2d5f4ee5214b Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 09 12월 2021 14:26:53 +0900
Subject: [PATCH] 사용자 정의필드 시간기능 추가
---
src/main/webapp/scripts/app/api/apiSetting.controller.js | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 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..70103fc 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -410,44 +410,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 +465,7 @@
function onChangeIssueTypeSpec() {
+ $scope.fn.getIssueStatuses();
$scope.fn.getIssueTypeCustomFields();
}
@@ -496,7 +501,6 @@
var jsonData = {
token: "||諛쒓툒諛쏆� �넗�겙||",
- title: "||�씠�뒋 �젣紐�||",
issueTypeId: $scope.vm.issueTypeId,
apiType: "modify",
issueStatusId: $scope.vm.issueStatusId,
--
Gitblit v1.8.0