From 9e1224315ff031c5cfccda6ccb0d7841729d8612 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 15 11월 2021 17:21:52 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js b/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js
index 24284c5..5a2d0e7 100644
--- a/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js
+++ b/src/main/webapp/scripts/app/issueType/issueTypeModify.controller.js
@@ -13,6 +13,7 @@
$scope.fn = {
getWorkflowListCallBack : getWorkflowListCallBack, // �썙�겕�뵆濡쒖슦 auto complete callback function
+ getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 auto complete callback function
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
@@ -28,12 +29,18 @@
id : parameter.id,
name : "",
workflows : [], // �썙�겕�뵆濡쒖슦
+ projects : [], // �봽濡쒖젥�듃
description : "", // �꽕紐�
color : "" // �깋�긽
},
workflowName : "",
+ projectName : "",
autoCompletePage : {
workflow : {
+ page : 0,
+ totalPage : 0
+ },
+ project : {
page : 0,
totalPage : 0
}
@@ -100,6 +107,10 @@
return true;
}
+ if ($scope.vm.form.projects.length < 1) {
+ return true;
+ }
+
return false;
}
@@ -116,6 +127,15 @@
}
return workflowId;
+ })(),
+ projectId : (function () {
+ var projectId = "";
+
+ if ($scope.vm.form.projects.length > 0) {
+ projectId = $scope.vm.form.projects[0].id;
+ }
+
+ return projectId;
})(),
name : $rootScope.preventXss($scope.vm.form.name),
description : $rootScope.preventXss($scope.vm.form.description),
@@ -144,6 +164,10 @@
$scope.vm.autoCompletePage.workflow.totalPage = result.data.page.totalPage;
}
+ function getProjectListCallBack(result) {
+ $scope.vm.autoCompletePage.project.totalPage = result.data.page.totalPage;
+ }
+
function cancel() {
$rootScope.$broadcast("closeLayer"); // �뙘�뾽�씠 �뿴由ш퀬 �굹�꽌 js-multi, js-single �벑�뿉�꽌 body �씠踰ㅽ듃媛� �궇�븘媛��뒗 �쁽�긽 �닔�젙
$uibModalInstance.dismiss('cancel');
@@ -163,6 +187,10 @@
$scope.vm.form.description = result.data.data.description;
$scope.vm.form.workflows.push(result.data.data.workflowVo);
$scope.vm.workflowName = result.data.data.workflowVo.name;
+ if (result.data.data.projectVo != null) {
+ $scope.vm.form.projects.push(result.data.data.projectVo);
+ $scope.vm.projectName = result.data.data.projectVo.name;
+ }
$scope.vm.form.color = result.data.data.color;
}
}
--
Gitblit v1.8.0