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 | 78 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index 32b7a6e..b8a9902 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -16,7 +16,8 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
onChangeEmailTemplate : onChangeEmailTemplate, // �씠硫붿씪 �뀥�뵆由� �꽑�깮�떆 �떎�뻾
- getEmailTemplateList : getEmailTemplateList // �씠硫붿씪 �뀥�뵆由� 紐⑸줉 媛��졇�삤湲�
+ getEmailTemplateList : getEmailTemplateList, // �씠硫붿씪 �뀥�뵆由� 紐⑸줉 媛��졇�삤湲�
+ getAccount : getAccount
};
$scope.vm = {
@@ -29,7 +30,8 @@
form : {
id : parameter.issueId, // �씠�뒋 踰덊샇
projects : [{ id : parameter.projectId}], // �봽濡쒖젥�듃
- mailUsers : parameter.partners.slice() // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
+ mailUsers : parameter.partners.slice(), // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
+ account : [{account : [], name : [], id : []}],
},
userName : "",
autoCompletePage : {
@@ -98,7 +100,9 @@
// �궗�슜�옄 �궘�젣
function removeMailTarget(index) {
- $scope.vm.form.mailUsers.splice(index, 1);
+ $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) {
@@ -124,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;
})(),
@@ -181,6 +185,68 @@
return deferred.promise;
}
+ // 硫붿씪 二쇱냼 異붿텧
+ function getAccount(partners) {
+ if (partners != null) {
+ var index = partners.length-1;
+ var id = partners[index].id;
+ var name = partners[index].name;
+ var account = partners[index].account;
+
+ 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;
+ 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);
+ }
+ });
+ 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];
+ }
+ }
+ }
+ }
+ }
+
+ $scope.$on("getMailTarget", function (event, result) {
+ $scope.fn.getAccount(result);
+ });
+
+ $scope.fn.getAccount();
$scope.fn.getEmailTemplateList();
}]);
--
Gitblit v1.8.0