From 9c283e735476f1106262de58b4042f30acf61a45 Mon Sep 17 00:00:00 2001 From: jhjang <jhjang@maprex.co.kr> Date: 월, 03 1월 2022 14:54:27 +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 | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 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..9e8d0c7 100644 --- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js +++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js @@ -25,7 +25,7 @@ ispVos : parameter.ispVos, hostingVos : parameter.hostingVos, partners : parameter.partnersAll.slice(), - html : "issueSendMailPartners.html", + html : "", 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, @@ -66,30 +68,34 @@ 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) { + /*if (emailTemplate.id === $scope.vm.emailTemplateId) { + $scope.vm.emailTitle = emailTemplate.title; + }*/ + if (emailTemplate.templateType === $scope.vm.emailTemplateType) { $scope.vm.emailTitle = emailTemplate.title; } }) } + // �궗�슜�옄 �궘�젣 function removeMailTarget(index) { $scope.vm.form.mailUsers.splice(index, 1); -- Gitblit v1.8.0