From 490aff099ae78fd76b5e3d6470541f8ce13286ec Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 28 1월 2022 14:06:40 +0900
Subject: [PATCH] - 이메일 보내는 사람 이름 설정 가능하게 수정 - 이슈 엑셀 임포트 시 프로젝트 선택하면 상위이슈 값 초기화 - 엑셀 임포트 시 띄어쓰기 공백 제거
---
src/main/webapp/scripts/app/issue/issueImportExcel.controller.js | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
index 202c00a..94f3dcb 100644
--- a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
@@ -31,6 +31,10 @@
},
projectName : "",
autoCompletePage : {
+ issue : {
+ page : 0,
+ totalPage : 0
+ },
project : {
page : 0,
totalPage : 0
@@ -46,9 +50,18 @@
$scope.vm.autoCompletePage.issue.totalPage = result.data.page.totalPage;
}
+ $scope.$on("projectListEvent", function (event, result) {
+ $scope.vm.form.projects = result;
+ $scope.vm.form.issues = "";
+ $scope.fn.getIssueTypes();
+ });
+
// �씠�뒋 �쑀�삎 紐⑸줉
function getIssueTypes() {
- IssueType.find($resourceProvider.getContent({},
+ if (!$rootScope.isDefined($scope.vm.form.projects[0])) {
+ return;
+ }
+ IssueType.find($resourceProvider.getContent({projectId : $scope.vm.form.projects[0].id},
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status === "success") {
@@ -127,21 +140,19 @@
}
},
fileFormDataName : "file"
- })
- .then(function (result) {
+ }).then(function (result) {
if (result.data.message.status === "success") {
-
$timeout(function () {
SweetAlert.success($filter("translate")("issue.succeededIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �꽦怨�
$scope.fn.cancel();
$rootScope.$broadcast("getIssueList");
+ $rootScope.spinner = false;
}, 1000);
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueRegistration"), result.data.message.message); // �씠�뒋 �벑濡� �떎�뙣
+ $rootScope.spinner = false;
}
-
- $rootScope.spinner = false;
});
}
--
Gitblit v1.8.0