From 4e5a589b93735ac56cfa8892db7bc1781f04b3d1 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 18:30:55 +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 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/apiSetting.controller.js b/src/main/webapp/scripts/app/api/apiSetting.controller.js
index 31a58c5..d24baf8 100644
--- a/src/main/webapp/scripts/app/api/apiSetting.controller.js
+++ b/src/main/webapp/scripts/app/api/apiSetting.controller.js
@@ -7,8 +7,8 @@
'app', 'angular'
],
function (app, angular) {
- app.controller('apiSettingController', ['$scope', '$rootScope', '$log', '$resourceProvider','$uibModal', 'SweetAlert', '$timeout', '$filter', '$injector', '$controller', 'Api', 'Priority', 'Severity', 'IssueType',
- function ($scope, $rootScope, $log, $resourceProvider, $uibModal, SweetAlert, $timeout, $filter, $injector, $controller, Api, Priority, Severity, IssueType) {
+ app.controller('apiSettingController', ['$scope', '$rootScope', '$log', '$resourceProvider','$uibModal', 'SweetAlert', '$timeout', '$filter', '$injector', '$controller', 'Api', 'Priority', 'Severity', 'IssueType', 'IssueTypeCustomField',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModal, SweetAlert, $timeout, $filter, $injector, $controller, Api, Priority, Severity, IssueType, IssueTypeCustomField) {
$scope.fn = {
changeTab : changeTab,
@@ -27,7 +27,9 @@
formSubmitOverlap : formSubmitOverlap,
removeCustomField : removeCustomField,
getOverlapList : getOverlapList,
- onChangeIssueTypeOverlap : onChangeIssueTypeOverlap
+ onChangeIssueTypeOverlap : onChangeIssueTypeOverlap,
+ getIssueTypeCustomFields : getIssueTypeCustomFields,
+ getCurrentIssueTypeVo : getCurrentIssueTypeVo
};
$scope.vm = {
@@ -37,6 +39,7 @@
priorities : [],
// projects : [],
form : {
+ issueCustomFields : [],
issueApiDefault : {
title : "",
description : "",
@@ -61,7 +64,6 @@
issueTypeId : "",
issueTypeName : "",
customFieldName : "",
- issueTypeData : null // �씠�뒋 �쑀�삎 媛앹껜
};
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
@@ -124,6 +126,18 @@
});
}
+ function getCurrentIssueTypeVo() {
+ var issueTypeId = $scope.vm.issueTypeId;
+
+ var issueTypeVo = null;
+ $scope.vm.issueTypes.forEach(function (issueType) {
+ if (issueType.id == issueTypeId) {
+ issueTypeVo = issueType;
+ }
+ });
+ return issueTypeVo;
+ }
+
function onChangeIssueTypeOverlap() {
$scope.fn.getOverlapList();
}
@@ -137,11 +151,14 @@
Api.findApiDefault($resourceProvider.getContent(
conditions, $resourceProvider.getPageContent(0, 1000))).then(function (result) {
$scope.fn.initForm();
+ $scope.fn.getIssueTypeCustomFields();
+
if (result.data.message.status === "success") {
if (angular.isDefined(result.data.data)) {
$scope.vm.form.issueApiDefault = result.data.data;
$scope.vm.form.issueApiDefault.priorityId = result.data.data.priorityId != null ? result.data.data.priorityId.toString() : "";
$scope.vm.form.issueApiDefault.severityId = result.data.data.severityId != null ? result.data.data.severityId.toString() : "";
+
// if (angular.isDefined(result.data.data.projectVo)) {
// $scope.vm.projects = [];
@@ -247,6 +264,34 @@
});
}
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶
+ function getIssueTypeCustomFields() {
+
+ $scope.vm.form.issueCustomFields = [];
+
+ var issueTypeVo = $scope.fn.getCurrentIssueTypeVo();
+ if (issueTypeVo.projectVo == null) return;
+
+ IssueTypeCustomField.find($resourceProvider.getContent({
+ projectId : issueTypeVo.projectVo.id,
+ IssueTypeId : issueTypeVo.id },
+ $resourceProvider.getPageContent(0, 1000))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+
+ $scope.vm.form.issueCustomFields = [];
+ angular.forEach(result.data.data, function (issueTypeCustomField) {
+ $scope.vm.form.issueCustomFields.push(issueTypeCustomField);
+ });
+ }
+ else {
+ SweetAlert.swal($filter("translate")("issue.failedToUserDefinedFieldListAssociatedLookup"), result.data.message.message, "error"); // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 �떎�뙣
+ }
+
+ });
+ }
+
+
// 以묒슂�룄 紐⑸줉
function getSeverities() {
Severity.find($resourceProvider.getContent({},
@@ -286,6 +331,7 @@
$scope.fn.getSeverities();
$scope.fn.getPriorities();
$scope.fn.getIssueTypes();
+
}
$scope.fn.start();
--
Gitblit v1.8.0