From f3144afceaa82dfc199ab2cb2f9518d49a151f7f Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 09:29:33 +0900
Subject: [PATCH] 이슈 상세 유형별 수정
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 52 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 5ad1972..73379b8 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -9,7 +9,7 @@
],
function (app, angular) {
app.controller('issueAddController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', '$uibModal', '$injector',
- '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'Issue', 'User', 'AttachedFile', 'IssueType', 'HostingField','Priority', 'Severity', 'IssueTypeCustomField', '$filter', '$state',
+ '$controller', '$tableProvider', 'SweetAlert', '$timeout', '$stateParams', '$q', 'Issue', 'User', 'AttachedFile', 'IssueType', 'HostingField', 'Priority', 'Severity', 'IssueTypeCustomField', '$filter', '$state',
function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, $uibModal, $injector, $controller, $tableProvider, SweetAlert, $timeout,
$stateParams, $q, Issue, User, AttachedFile, IssueType, HostingField, Priority, Severity, IssueTypeCustomField, $filter, $state) {
@@ -37,10 +37,11 @@
setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲�
startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
containsPartner : containsPartner,
- getPartners : getPartners
+ getPartners : getPartners,
};
$scope.vm = {
+ partnerVos : "",
form : {
title : "", // �젣紐�
description : "", // �궡�슜
@@ -133,14 +134,11 @@
$scope.$watch("vm.form.projects", function (newValue, oldValue) {
if (angular.isDefined(newValue)) {
if (newValue.length < 1) {
- $scope.vm.form.departments = [];
- $scope.vm.form.issueCustomFields = [];
+ $scope.vm.form.users = [];
}
- else {
- if ($rootScope.isDefined($scope.vm.issueTypeId)) {
- $scope.fn.getIssueTypeCustomFields();
- }
- }
+
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲�
+ $scope.fn.getIssueTypeCustomFields();
}
});
@@ -322,14 +320,15 @@
function containsPartner(name) {
var result = false;
- if ($scope.vm.partnerVos != null) {
- $scope.vm.partnerVos.forEach(function (partnerVo) {
+ if ($scope.vm.viewer.usePartnerVo != null) {
+ $scope.vm.viewer.usePartnerVo.forEach(function (partnerVo) {
if (name === partnerVo.name) {
result = true;
}
});
}
return result;
+
}
// �떞�떦�옄 autocomplete page �뾽�뜲�씠�듃�듃
@@ -650,6 +649,22 @@
return deferred.promise;
}
+ // �뾽泥�/ISP/�샇�뒪�똿 �씠由꾩씠 �룷�븿 �뿬遺� �솗�씤
+ function containsPartner(name) {
+ var result = false;
+
+ if ($scope.vm.partnerVos != null) {
+ $scope.vm.partnerVos.forEach(function (partnerVo) {
+ if (name === partnerVo.name) {
+ result = true;
+ }
+ });
+ }
+ return result;
+
+ }
+
+
// 以묒슂�룄 紐⑸줉
function getSeverities() {
var deferred = $q.defer();
@@ -762,18 +777,20 @@
}
}
- function getPartners() {
- HostingField.getPartnerList($resourceProvider.getContent(
- {},
+ function getPartners() {
+ var content = {
+ issueTypeId : $scope.vm.form.issueTypeId
+ };
+ Issue.findPartners($resourceProvider.getContent(
+ content,
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
- $scope.vm.partnerVos = result.data.content;
+ $scope.vm.partnerVos = result.data.data;
}
});
}
-
// 理쒖큹 �떎�뻾
function startExecute() {
@@ -781,7 +798,8 @@
var promises = {
getIssueTypes : $scope.fn.getIssueTypes(),
getPriorities : $scope.fn.getPriorities(),
- getSeverities : $scope.fn.getSeverities()
+ getSeverities : $scope.fn.getSeverities(),
+ getPartners : $scope.fn.getPartners()
};
$q.all(promises).then(function (results) {
// �쁽�옱 �봽濡쒖젥�듃 �꽕�젙
--
Gitblit v1.8.0