From 2b5c6c4c2b6d54ec4a2f2ba57561d8912065e0ee Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 19 1월 2022 15:48:28 +0900
Subject: [PATCH] - 전체프로젝트가 선택 된 상태에서 ISSUE TYPE LIST 선택 시에도 전체프로젝트로 유지되도록 수정 - 전체 프로젝트 또는 전체 이슈 일 경우에도 '이슈 만들기' 버튼 보이도록 수정(만들기 폼에서 프로젝트,이슈유형 수정가능하도록)
---
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index 14d5895..b8a9902 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -101,6 +101,8 @@
// �궗�슜�옄 �궘�젣
function removeMailTarget(index) {
$scope.vm.form.account[0].account.splice(index, 1);
+ $scope.vm.form.account[0].name.splice(index, 1);
+ $scope.vm.form.account[0].id.splice(index, 1);
}
function formCheck(formInvalid) {
@@ -126,9 +128,9 @@
sendEmails : (function () {
var sendEmails = [];
- angular.forEach($scope.vm.form.mailUsers, function (user) {
- sendEmails.push($rootScope.encryption(user.account));
- });
+ for(var i=0; i < $scope.vm.form.account[0].account.length; i++) {
+ sendEmails.push($rootScope.encryption($scope.vm.form.account[0].account[i]));
+ }
return sendEmails;
})(),
@@ -189,27 +191,52 @@
var index = partners.length-1;
var id = partners[index].id;
var name = partners[index].name;
- var account = partners[index].account.split(",");
+ var account = partners[index].account;
- for (var i = 0; i < account.length; i++) {
- $scope.vm.form.account[0].id[index+i] = id;
- $scope.vm.form.account[0].account[index+i] = account[i].trim();
- $scope.vm.form.account[0].name[index+i] = name;
+ if(account != null && account.indexOf(",") !== -1) {
+ account = partners[index].account.split(",");
+ for (var i = 0; i < account.length; i++) {
+ $scope.vm.form.account[0].account[index+i] = account[i].trim();
+ $scope.vm.form.account[0].name[index+i] = name;
+ $scope.vm.form.account[0].id[index+i] = id;
+ }
+ } else {
+ $scope.vm.form.account[0].account[index] = account;
+ $scope.vm.form.account[0].name[index] = name;
+ $scope.vm.form.account[0].id[index] = id;
}
} else {
if (parameter.partners != null) {
var account = "";
var name = "";
var id = "";
+ var accountArr = [];
+ var nameArr = [];
+ var idArr =[];
angular.forEach(parameter.partners, function (partner) {
id = partner.id;
- account = partner.account.split(",");
+ account = partner.account;
name = partner.name;
+ if(account != null && account.indexOf(",") !== -1) {
+ //硫붿씪二쇱냼媛� �뿬�윭媛쒖씪寃쎌슦 遺꾨━ 諛� 怨듬갚 �젣嫄�
+ account = partner.account.split(",");
+ for (var i = 0; i < account.length; i++) {
+ accountArr.push(account[i].trim());
+ nameArr.push(name);
+ idArr.push(id);
+ }
+ } else {
+ accountArr.push(account);
+ nameArr.push(name);
+ idArr.push(id);
+ }
});
- for (var i = 0; i < account.length; i++) {
- $scope.vm.form.account[0].id[i] = id;
- $scope.vm.form.account[0].account[i] = account[i].trim();
- $scope.vm.form.account[0].name[i] = name;
+ if(accountArr != null && accountArr.length > 0) {
+ for (var i = 0; i < accountArr.length; i++) {
+ $scope.vm.form.account[0].account[i] = accountArr[i];
+ $scope.vm.form.account[0].name[i] = nameArr[i];
+ $scope.vm.form.account[0].id[i] = idArr[i];
+ }
}
}
}
--
Gitblit v1.8.0