From 6adb341db180240e0af34ace40100912d4ed5257 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 06 1월 2022 11:02:57 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index 4d5625a..32b7a6e 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -17,7 +17,6 @@
formCheck : formCheck, // �뤌 泥댄겕
onChangeEmailTemplate : onChangeEmailTemplate, // �씠硫붿씪 �뀥�뵆由� �꽑�깮�떆 �떎�뻾
getEmailTemplateList : getEmailTemplateList // �씠硫붿씪 �뀥�뵆由� 紐⑸줉 媛��졇�삤湲�
- // showEmailTemplate : showEmailTemplate,
};
$scope.vm = {
@@ -26,6 +25,7 @@
hostingVos : parameter.hostingVos,
partners : parameter.partnersAll.slice(),
html : "",
+ tab : "SEND_TEMPLATE",
form : {
id : parameter.issueId, // �씠�뒋 踰덊샇
projects : [{ id : parameter.projectId}], // �봽濡쒖젥�듃
@@ -40,14 +40,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 +59,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,28 +69,30 @@
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;
+ }
+ })
+ }
}
@@ -177,6 +182,7 @@
}
$scope.fn.getEmailTemplateList();
+
}]);
});
--
Gitblit v1.8.0