From 3865b64f64a4954110364c2903dcb525c3c8c9bb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 18:19:52 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueSendMail.controller.js | 33 ++++++++++++++++++++++++++++++++-
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 6 +++---
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 3c41b1c..fbb2efc 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -1081,9 +1081,9 @@
partners : partners,
issueId : $scope.vm.viewer.id,
projectId : $scope.vm.viewer.projectVo.id,
- ispVos : $scope.vm.viewer.ispVos,
- hosingVos : $scope.vm.viewer.hosingVos,
- companyVos : $scope.vm.viewer.companyVos,
+ companyVos : $scope.vm.viewer.issueCompanyVos,
+ ispVos : $scope.vm.viewer.issueIspVos,
+ hosingVos : $scope.vm.viewer.issueHostingVos,
}
}
});
diff --git a/src/main/webapp/scripts/app/issue/issueSendMail.controller.js b/src/main/webapp/scripts/app/issue/issueSendMail.controller.js
index d4cb1c6..24b2e5b 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMail.controller.js
@@ -69,7 +69,37 @@
});
return sendEmails;
- })()
+ })(),
+ companyVos : (function () {
+ var companyVos = [];
+
+ angular.forEach($scope.vm.companyVos, function (company) {
+ companyVos.push(company);
+ });
+
+ return companyVos;
+ })(),
+ ispVos : (function () {
+ var ispVos = [];
+
+ angular.forEach($scope.vm.ispVos, function (isp) {
+ ispVos.push(isp);
+ });
+
+ return ispVos;
+ })(),
+ hostingVos : (function () {
+ var hostingVos = [];
+
+ angular.forEach($scope.vm.hostingVos, function (hosting) {
+ hostingVos.push(hosting);
+ });
+
+ return hostingVos;
+ })(),
+ // companyVos : parameter.companyVos,
+ // ispVos : parameter.ispVos,
+ // hostingVos : parameter.hostingVos,
};
Issue.sendEmail($resourceProvider.getContent(
@@ -119,5 +149,6 @@
return deferred.promise;
}
+
}]);
});
--
Gitblit v1.8.0