From 64e60497047f9bf85e0fcff2e6c0718b8eb16af2 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 18:04:09 +0900
Subject: [PATCH] - 엑셀 임포트시 워크플로우에 담당부서가 없을경우도 등록 가능하게 수정 - 엑셀 임포트시 상위이슈 선택 안해도 등록 가능
---
src/main/webapp/scripts/app/issue/issueImportExcel.controller.js | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
index 035e8e1..202c00a 100644
--- a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
@@ -17,7 +17,8 @@
formCheck : formCheck, // �뤌 泥댄겕
getIssueTypes : getIssueTypes, // �씠�뒋 ���엯 紐⑸줉 媛��졇�삤湲�
makeSearchConditions : makeSearchConditions, // �꽑�깮�븳 議곌굔�쓣 json �쑝濡� 留뚮뱺�떎.
- onFileSelect : onFileSelect // �뙆�씪 �뾽濡쒕뱶
+ onFileSelect : onFileSelect, // �뙆�씪 �뾽濡쒕뱶
+ getIssueListCallBack : getIssueListCallBack // �씠�뒋 autocomplete page �뾽�뜲�씠�듃
};
$scope.vm = {
@@ -39,6 +40,11 @@
};
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+
+ // �씠�뒋 autocomplete page �뾽�뜲�씠�듃
+ function getIssueListCallBack(result) {
+ $scope.vm.autoCompletePage.issue.totalPage = result.data.page.totalPage;
+ }
// �씠�뒋 �쑀�삎 紐⑸줉
function getIssueTypes() {
@@ -88,9 +94,9 @@
return false;
}
- if ($scope.vm.form.issues == null || $scope.vm.form.issues.length === 0) {
+ /*if ($scope.vm.form.issues == null || $scope.vm.form.issues.length === 0) {
return false;
- }
+ }*/
if ($scope.vm.form.file.length < 1) {
return true;
@@ -111,7 +117,13 @@
content : {
projectId : $scope.vm.form.projects[0].id,
issueTypeId : $scope.vm.form.issueTypeId,
- parentIssueId : $scope.vm.form.issues[0].id
+ parentIssueId : (function () {
+ var id = -1;
+ if ($scope.vm.form.issues != null) {
+ id = $scope.vm.form.issues[0].id
+ }
+ return id;
+ })()
}
},
fileFormDataName : "file"
--
Gitblit v1.8.0