From 491455286747cb100caee9ca12d9b5a94077b85e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 18 1월 2022 10:07:11 +0900
Subject: [PATCH] 이슈 추가/수정 시 ISP, 호스팅 이름 못 불러오는 문제 해결 (custom-input)
---
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 100 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 81 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index e4f78ef..f1a4539 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -16,8 +16,8 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
onChangeEmailTemplate : onChangeEmailTemplate, // �씠硫붿씪 �뀥�뵆由� �꽑�깮�떆 �떎�뻾
- getEmailTemplateList : getEmailTemplateList // �씠硫붿씪 �뀥�뵆由� 紐⑸줉 媛��졇�삤湲�
- // showEmailTemplate : showEmailTemplate,
+ getEmailTemplateList : getEmailTemplateList, // �씠硫붿씪 �뀥�뵆由� 紐⑸줉 媛��졇�삤湲�
+ getAccount : getAccount
};
$scope.vm = {
@@ -25,11 +25,13 @@
ispVos : parameter.ispVos,
hostingVos : parameter.hostingVos,
partners : parameter.partnersAll.slice(),
- html : "issueSendMailPartners.html",
+ html : "",
+ tab : "SEND_TEMPLATE",
form : {
id : parameter.issueId, // �씠�뒋 踰덊샇
projects : [{ id : parameter.projectId}], // �봽濡쒖젥�듃
- mailUsers : parameter.partners.slice() // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
+ mailUsers : parameter.partners.slice(), // 硫붿씪 �쟾�넚諛쏅뒗 �궗�슜�옄
+ account : [{account : [], name : [], id : []}],
},
userName : "",
autoCompletePage : {
@@ -40,14 +42,16 @@
},
emailTitle : "",
emailTemplateId : -1,
- emailTemplates : []
+ emailTemplates : [],
+ emailTemplateType : "",
};
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
function onChangeEmailTemplate() {
var content = {
- id : $scope.vm.emailTemplateId
+ templateType : $scope.vm.emailTemplateType,
+ issueId : parameter.issueId
}
EmailTemplate.find($resourceProvider.getContent(
content,
@@ -57,7 +61,8 @@
$scope.vm.html = result.data.data.template;
}
else {
- SweetAlert.error($filter("translate")("issue.failedIssueMail"), result.data.message.message); // "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣"
+ $scope.vm.html = "";
+ //SweetAlert.warning($filter("translate")("issue.selectedPartnersMail"),$filter("translate")("issue.selectedPartnersTemplate")); // option �꽑�깮 寃쎄퀬
}
$rootScope.spinner = false;
@@ -66,33 +71,36 @@
function getEmailTemplateList() {
$scope.vm.emailTemplates.push({
- id : 1,
+ templateType : "ISSUE_SEND_1",
title : "�뀥�뵆由�1"
});
$scope.vm.emailTemplates.push({
- id : 2,
+ templateType : "ISSUE_SEND_2",
title : "�뀥�뵆由�2"
});
$scope.vm.emailTemplates.push({
- id : 3,
+ templateType : "ISSUE_SEND_3",
title : "�뀥�뵆由�3"
});
$scope.vm.emailTemplateId = 1;
$scope.vm.emailTitle = "";
- $scope.vm.emailTemplates.forEach(function (emailTemplate) {
- if (emailTemplate.id === $scope.vm.emailTemplateId) {
- $scope.vm.emailTitle = emailTemplate.title;
- }
- })
+ if ($rootScope.isDefined($scope.vm.emailTemplateType)) {
+ $scope.vm.emailTemplates.forEach(function (emailTemplate) {
+ if (emailTemplate.templateType === $scope.vm.emailTemplateType) {
+ $scope.vm.emailTitle = emailTemplate.title;
+ }
+ })
+ }
}
+
// �궗�슜�옄 �궘�젣
function removeMailTarget(index) {
- $scope.vm.form.mailUsers.splice(index, 1);
+ $scope.vm.form.account[0].account.splice(index, 1);
}
function formCheck(formInvalid) {
@@ -118,9 +126,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;
})(),
@@ -175,7 +183,61 @@
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 = "";
+ angular.forEach(parameter.partners, function (partner) {
+ id = partner.id;
+ account = partner.account;
+ if(account != null && account.indexOf(",") !== -1) {
+ account = partner.account.split(",");
+ }
+ name = partner.name;
+ });
+ if(account != null && account.size > 1) {
+ for (var i = 0; i < account.size; i++) {
+ $scope.vm.form.account[0].account[i] = account[i].trim();
+ $scope.vm.form.account[0].name[i] = name;
+ $scope.vm.form.account[0].id[i] = id;
+ }
+ } else {
+ $scope.vm.form.account[0].account[i] = account;
+ $scope.vm.form.account[0].name[i] = name;
+ $scope.vm.form.account[0].id[i] = id;
+ }
+ }
+ }
+ }
+
+ $scope.$on("getMailTarget", function (event, result) {
+ $scope.fn.getAccount(result);
+ });
+
+ $scope.fn.getAccount();
$scope.fn.getEmailTemplateList();
+
}]);
});
--
Gitblit v1.8.0