Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2022-01-06 6adb341db180240e0af34ace40100912d4ed5257

 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}],  //  프로젝트
@@ -59,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;
@@ -85,14 +86,13 @@

                    $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 (emailTemplate.templateType === $scope.vm.emailTemplateType) {
                            $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;
                            }
                        })
                    }
                }


@@ -182,6 +182,7 @@
                }

                $scope.fn.getEmailTemplateList();

            }]);

    });