From 71b8c61b79be17f9ac886b947051d3256a32f159 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 18 2월 2022 11:14:16 +0900
Subject: [PATCH] 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 추가
---
src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js b/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
index 589a9ae..f1261a6 100644
--- a/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
+++ b/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
@@ -13,8 +13,10 @@
$scope.fn = {
getWorkflowListCallBack : getWorkflowListCallBack, // �썙�겕�뵆濡쒖슦 auto complete callback function
+ getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 auto complete callback function
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
+ removeUsePartner : removeUsePartner, // �뾽泥�/ISP/�샇�뒪�똿 �궘�젣
formCheck : formCheck // �뤌 泥댄겕
};
@@ -22,12 +24,21 @@
form : {
name : "", // �씠�뒋 ���엯 紐�
workflows : [], // �썙�겕�뵆濡쒖슦
+ projects : [], // �봽濡쒖젥�듃
description : "", // �꽕紐�
- color : "#febd35" // �깋�긽
+ color : "#febd35", // �깋�긽
+ companies : [], // �뾽泥�/isp/�샇�뒪�똿 �꽑�깮 諛곗뿴
+ inheritPartners : true // �뙆�듃�꼫 �긽�냽 �쑀臾�
},
+ companyName : "",
+ projectName : "",
workflowName : "",
autoCompletePage : {
workflow : {
+ page : 0,
+ totalPage : 0
+ },
+ project : {
page : 0,
totalPage : 0
}
@@ -104,8 +115,18 @@
return true;
}
+ if ($scope.vm.form.projects.length < 1) {
+ return true;
+ }
+
return false;
}
+
+ // �뾽泥�/ISP/�샇�뒪�똿 �궘�젣
+ function removeUsePartner(index) {
+ $scope.vm.form.companies.splice(index, 1);
+ }
+
function formSubmit() {
$rootScope.spinner = true;
@@ -120,9 +141,35 @@
return workflowId;
})(),
+ projectId : (function () {
+ var projectId = "";
+
+ if ($scope.vm.form.projects.length > 0) {
+ projectId = $scope.vm.form.projects[0].id;
+ }
+
+ return projectId;
+ })(),
+ companyIds : (function () {
+ var companyIds = [];
+
+ $scope.vm.form.companies.forEach(function (company) {
+ companyIds.push(company.id);
+ });
+
+ return companyIds;
+ })(),
+
name : $rootScope.preventXss($scope.vm.form.name),
description : $rootScope.preventXss($scope.vm.form.description),
- color : $scope.vm.form.color
+ color : $scope.vm.form.color,
+ inheritPartners : (function () {
+ let inheritPartners = false;
+ if ($scope.vm.form.inheritPartners) {
+ inheritPartners = true;
+ }
+ return inheritPartners;
+ })()
};
IssueType.add($resourceProvider.getContent(
@@ -131,6 +178,7 @@
if (result.data.message.status === "success") {
$scope.fn.cancel();
+ $rootScope.$broadcast("modifyIssueType", {});
// 紐⑸줉 �솕硫� 媛깆떊
$rootScope.$broadcast("getIssueTypeList", {});
}
@@ -147,6 +195,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');
--
Gitblit v1.8.0