From ad486a401ad59d44bd4187f6406fe8c11b046a1f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 월, 21 2월 2022 16:05:09 +0900
Subject: [PATCH] - 파트너 정보 엑셀 임포트 시 연락처, 코드, 이메일 유효성 검사 - 특정 프로젝트로 설정된 상태에서 타 프로젝트의 이슈 클릭 시 대시보드로 이동되는 문제 해결
---
src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js | 54 ++++++++++++++++++++++++------------------------------
1 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js b/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
index f9f3a04..f1261a6 100644
--- a/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
+++ b/src/main/webapp/scripts/app/issueType/issueTypeAdd.controller.js
@@ -16,6 +16,7 @@
getProjectListCallBack : getProjectListCallBack, // �봽濡쒖젥�듃 auto complete callback function
cancel : cancel, // �뙘�뾽 李� �떕湲�
formSubmit : formSubmit, // �뤌 �쟾�넚
+ removeUsePartner : removeUsePartner, // �뾽泥�/ISP/�샇�뒪�똿 �궘�젣
formCheck : formCheck // �뤌 泥댄겕
};
@@ -26,13 +27,10 @@
projects : [], // �봽濡쒖젥�듃
description : "", // �꽕紐�
color : "#febd35", // �깋�긽
- companyFields : [], // �뾽泥댁젙蹂�
- ispFields : [], // ISP �젙蹂�
- hostingFields : [] // �샇�뒪�똿�젙蹂�
+ companies : [], // �뾽泥�/isp/�샇�뒪�똿 �꽑�깮 諛곗뿴
+ inheritPartners : true // �뙆�듃�꼫 �긽�냽 �쑀臾�
},
companyName : "",
- ispId : "",
- hostingId : "",
projectName : "",
workflowName : "",
autoCompletePage : {
@@ -124,6 +122,12 @@
return false;
}
+ // �뾽泥�/ISP/�샇�뒪�똿 �궘�젣
+ function removeUsePartner(index) {
+ $scope.vm.form.companies.splice(index, 1);
+ }
+
+
function formSubmit() {
$rootScope.spinner = true;
@@ -146,36 +150,26 @@
return projectId;
})(),
- companyId : (function () {
- var companyId = "";
+ companyIds : (function () {
+ var companyIds = [];
- if ($scope.vm.form.companyFields.length > 0) {
- companyId = $scope.vm.form.companyFields[0].id;
- }
+ $scope.vm.form.companies.forEach(function (company) {
+ companyIds.push(company.id);
+ });
- return companyId;
- }),
- ispId : (function () {
- var ispId = "";
+ return companyIds;
+ })(),
- if ($scope.vm.form.ispFields.length > 0) {
- ispId = $scope.vm.form.ispFields[0].id;
- }
-
- return ispId;
- }),
- hostingId : (function () {
- var hostingId = "";
-
- if ($scope.vm.form.hostingFields.length > 0) {
- hostingId = $scope.vm.form.hostingFields[0].id;
- }
-
- return hostingId;
- }),
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(
--
Gitblit v1.8.0