From 70e3ad43e441d07d16c7e4e1af0e093befd62c01 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 19:36:11 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueImportExcel.controller.js | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
index 633ebb8..b4983b4 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() {
@@ -84,6 +90,14 @@
// �뤌 泥댄겕
function formCheck() {
+ if ($scope.vm.form.projects == null || $scope.vm.form.projects.length === 0) {
+ return false;
+ }
+
+ if ($scope.vm.form.issues == null || $scope.vm.form.issues.length === 0) {
+ return false;
+ }
+
if ($scope.vm.form.file.length < 1) {
return true;
}
@@ -100,7 +114,11 @@
file : $scope.vm.form.file,
// data �냽�꽦�쑝濡� 蹂꾨룄�쓽 �뜲�씠�꽣 �쟾�넚
fields : {
- content : {}
+ content : {
+ projectId : $scope.vm.form.projects[0].id,
+ issueTypeId : $scope.vm.form.issueTypeId,
+ parentIssueId : $scope.vm.form.issues[0].id
+ }
},
fileFormDataName : "file"
})
--
Gitblit v1.8.0