From ea58f79355dd5715c7889623f59f5e8fca81e811 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 23 12월 2021 15:51:39 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/api/apiSetting.controller.js | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index 2f7e1f6..5d781a5 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -25,17 +25,19 @@
getSeverities : getSeverities,
onChangeColumnSetting : onChangeColumnSetting,
onChangeEndIssueStatus : onChangeEndIssueStatus,
+ onChangeIssueTypeOverlap : onChangeIssueTypeOverlap,
+ onChangeIssueTypeSpec : onChangeIssueTypeSpec,
+ onChangeProject : onChangeProject,
+ onChangeIssueStatus : onChangeIssueStatus,
getIssueTypes : getIssueTypes,
reset : reset,
resetOverlap : resetOverlap,
formSubmitOverlap : formSubmitOverlap,
removeCustomField : removeCustomField,
getOverlapList : getOverlapList,
- onChangeIssueTypeOverlap : onChangeIssueTypeOverlap,
getIssueTypeCustomFields : getIssueTypeCustomFields,
getCurrentIssueTypeVo : getCurrentIssueTypeVo,
getIssueStatuses : getIssueStatuses,
- onChangeIssueTypeSpec : onChangeIssueTypeSpec,
createRequestModifyJson : createRequestModifyJson,
createRequestAddJson : createRequestAddJson,
createCustomFields : createCustomFields,
@@ -44,8 +46,9 @@
loadPage : loadPage,
resetCompleteIssueStatus : resetCompleteIssueStatus,
findIssueList : findIssueList,
- onChangeProject : onChangeProject,
- setApiIssueTypeStatus : setApiIssueTypeStatus
+ setApiIssueTypeStatus : setApiIssueTypeStatus,
+ findToken : findToken,
+ createAPISample : createAPISample
};
$scope.vm = {
@@ -60,6 +63,7 @@
sampleJsonModify : "",
// projects : [],
form : {
+ token : "!�넗�겙媛믪엯�젰(�넗�겙諛쒓툒�븘�슂)!",
issueCustomFields : [],
issueApiDefault : {
title : "",
@@ -316,7 +320,7 @@
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶
function getIssueTypeCustomFields() {
-
+ var deferred = $q.defer();
$scope.vm.form.issueCustomFields = [];
var issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
@@ -335,7 +339,7 @@
$scope.vm.form.issueCustomFields.push(issueTypeCustomField);
});
- $scope.$broadcast("getIssueTypeListComplete", $scope.vm.form.issueCustomFields);
+ deferred.resolve(result.data.data);
}
else {
@@ -343,6 +347,7 @@
}
});
+ return deferred.promise;
}
@@ -361,12 +366,12 @@
});
}
- $scope.$on("getIssueTypeListComplete", function (event, args) {
- if ($scope.vm.tab === "API_SPEC_SETTING") {
- $scope.fn.createRequestAddJson();
- $scope.fn.createRequestModifyJson();
- }
- });
+ // $scope.$on("getIssueTypeListComplete", function (event, args) {
+ // if ($scope.vm.tab === "API_SPEC_SETTING") {
+ // $scope.fn.createRequestAddJson();
+ // $scope.fn.createRequestModifyJson();
+ // }
+ // });
function changeTab(tab) {
$scope.vm.tab = tab;
@@ -411,6 +416,7 @@
}
function getIssueStatuses() {
+ var deferred = $q.defer();
var condition = {
issueTypeId: $scope.vm.issueTypeId
}
@@ -419,6 +425,7 @@
if (result.data.message.status === "success") {
$scope.vm.issueStatuses = result.data.data;
+ deferred.resolve(result.data.data);
// $scope.vm.issueStatusId = "";
if ($scope.vm.issueStatuses != null && $scope.vm.issueStatuses.length > 0) {
@@ -429,11 +436,11 @@
$scope.fn.setApiIssueTypeStatus();
}
- $scope.$broadcast("getIssueStatusComplete", $scope.vm.issueStatuses);
} else {
SweetAlert.swal($filter("translate")("issue.failedToCriticalListLookup"), result.data.message.message, "error"); // 以묒슂�룄 紐⑸줉 議고쉶 �떎�뙣
}
});
+ return deferred.promise;
}
function onChangeColumnSetting() {
@@ -502,9 +509,28 @@
});
}
+ function createAPISample() {
+ $scope.fn.createRequestAddJson();
+ $scope.fn.createRequestModifyJson();
+ }
+
+ function onChangeIssueStatus() {
+ // $scope.fn.getIssueStatuses();
+ // $scope.fn.getIssueTypeCustomFields();
+ $scope.fn.findToken();
+ $scope.fn.createAPISample();
+ }
+
+
function onChangeIssueTypeSpec() {
- $scope.fn.getIssueStatuses();
- $scope.fn.getIssueTypeCustomFields();
+ var promises = {
+ issueStatues : $scope.fn.getIssueStatuses(),
+ issueTypeCustomFields : $scope.fn.getIssueTypeCustomFields(),
+ token : $scope.fn.findToken()
+ }
+ $q.all(promises).then(function (results) {
+ $scope.fn.createAPISample();
+ });
}
// �슂泥� �뜲�씠�꽣 留뚮뱾湲�( 異붽�)
@@ -512,7 +538,7 @@
var customFields = $scope.fn.createCustomFields();
var jsonData = {
- token: "||諛쒓툒諛쏆� �넗�겙}||",
+ token: $scope.vm.form.token,
title: "||�씠�뒋 �젣紐�||",
issueTypeId: $scope.vm.issueTypeId,
apiType: "add",
@@ -520,6 +546,29 @@
};
$scope.vm.sampleJsonAdd = JSON.stringify(jsonData,undefined, 4);
+ }
+
+
+ function findToken() {
+ var deferred = $q.defer();
+ var conditions = {
+ }
+
+ Api.find($resourceProvider.getContent(conditions,
+ $resourceProvider.getPageContent(0, 1))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ if (result.data.data != null) {
+ $scope.vm.form.token = result.data.data.token;
+ }
+ deferred.resolve(result.data.data);
+ }
+ else {
+
+ }
+ });
+
+ return deferred.promise;
}
function createCustomFields() {
@@ -538,7 +587,7 @@
var customFields = $scope.fn.createCustomFields();
var jsonData = {
- token: "||諛쒓툒諛쏆� �넗�겙||",
+ token: $scope.vm.form.token,
issueTypeId: $scope.vm.issueTypeId,
apiType: "modify",
issueStatusId: $scope.vm.issueStatusId,
--
Gitblit v1.8.0