From 12ee57fe168d76d8a71993a1473dba8b20d49ab9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 09:43:53 +0900
Subject: [PATCH] 이슈(추가,수정)충돌 수정
---
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 55 +++++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index a9c898c..ca93bbb 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -41,6 +41,7 @@
};
$scope.vm = {
+ partnerVos : "",
form : {
title : "", // �젣紐�
description : "", // �궡�슜
@@ -139,6 +140,10 @@
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶 媛��졇�삤湲�
$scope.fn.getIssueTypeCustomFields();
}
+ });
+
+ $scope.$watch("vm.form.issueTypeId", function (newValue, oldValue) {
+ $scope.vm.partnerVos = $scope.fn.getPartners();
});
// �꽟癒몃끂�듃 �씠誘몄� �뾽濡쒕뱶
@@ -573,27 +578,27 @@
},
fileFormDataName : "file"
}).then(function (result) {
- if (result.data.message.status === "success") {
- // �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬.
- if ($scope.vm.infiniteAdd) {
- $scope.fn.infiniteAddForm();
- }
- else {
- $scope.fn.cancel();
-
- if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
- $state.go("issues.list");
- }
- }
-
- $rootScope.$broadcast("getIssueList", {});
+ if (result.data.message.status === "success") {
+ // �뿰�냽 �벑濡� 泥댄겕�떆 �씠�룞�븯吏� �븡�쓬.
+ if ($scope.vm.infiniteAdd) {
+ $scope.fn.infiniteAddForm();
}
else {
- SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ $scope.fn.cancel();
+
+ if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
+ $state.go("issues.list");
+ }
}
- $rootScope.spinner = false;
- });
+ $rootScope.$broadcast("getIssueList", {});
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ }
+
+ $rootScope.spinner = false;
+ });
}
// �뙘�뾽 李� �떕湲�
@@ -757,17 +762,18 @@
}
function getPartners() {
-
- HostingField.getPartnerList($resourceProvider.getContent(
- {},
+ 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() {
@@ -775,7 +781,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) {
// �쁽�옱 �봽濡쒖젥�듃 �꽕�젙
@@ -792,4 +799,4 @@
$scope.fn.startExecute();
}]);
- });
+ });
\ No newline at end of file
--
Gitblit v1.8.0