From ab13ec078a26ec1439682ba579b710f6c390f035 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 29 11월 2021 01:58:54 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 40 ++++++++++------------------------------
1 files changed, 10 insertions(+), 30 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..94947eb 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -9,9 +9,9 @@
],
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', '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) {
+ $stateParams, $q, Issue, User, AttachedFile, IssueType, Priority, Severity, IssueTypeCustomField, $filter, $state) {
$scope.fn = {
cancel : cancel, // �뙘�뾽 李� �떕湲�
@@ -36,8 +36,7 @@
removeDepartment : removeDepartment, // �떞�떦遺��꽌 �궘�젣
setIssueTypeTemplate : setIssueTypeTemplate, // �씠�뒋 �쑀�삎 �뀥�뵆由� �쟻�슜�븯湲�
startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
- containsPartner : containsPartner,
- getPartners : getPartners
+ containsPartner : containsPartner
};
$scope.vm = {
@@ -133,19 +132,12 @@
$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.$watch("vm.form.issueTypeId", function (newValue, oldValue) {
- $scope.vm.partnerVos = $scope.fn.getPartners();
+ // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲�
+ $scope.fn.getIssueTypeCustomFields();
+ }
});
// �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
@@ -322,14 +314,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 �뾽�뜲�씠�듃�듃
@@ -761,19 +754,6 @@
}
}
}
-
- function getPartners() {
-
- HostingField.getPartnerList($resourceProvider.getContent(
- {},
- $resourceProvider.getPageContent(0, 1))).then(function (result) {
- if (result.data.message.status === "success") {
- $scope.vm.partnerVos = result.data.content;
- }
- });
-
- }
-
// 理쒖큹 �떎�뻾
function startExecute() {
--
Gitblit v1.8.0