From 79103ca4febf3fd12b20309e1487c6c2cc9b9b32 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 03 12월 2021 10:42:47 +0900
Subject: [PATCH] 이메일 템플릿 수정
---
src/main/webapp/views/issue/issueSendMailPartners.html | 2 +-
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 16 +++++++++-------
src/main/webapp/assets/styles/main.css | 3 +++
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 1 +
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/assets/styles/main.css b/src/main/webapp/assets/styles/main.css
index 30df0e3..2d4c0ac 100644
--- a/src/main/webapp/assets/styles/main.css
+++ b/src/main/webapp/assets/styles/main.css
@@ -30390,10 +30390,12 @@
.TemplateIMG {
height: 50px;
width: 50px;
+ margin: 20px;
}
.TemplateIMG-selected {
border: 2px solid #0066ff;
+
}
.TemplateIMG:active {
@@ -30402,6 +30404,7 @@
.TemplateIMG:visited {
border: 2px solid #0066ff;
+
}
.Template-area {
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 9a44c3c..deb92af 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -651,10 +651,15 @@
}
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
- // $rootScope.$on("getIssueDetail", function (event, args) {
- // $scope.vm.viewer.id = args["id"];
- // $scope.fn.getIssueDetail();
- // });
+ // $rootScope.$on("getIssueDetail", function (event, args) {
+ // $scope.vm.viewer.id = args["id"];
+ // $scope.fn.getIssueDetail();
+ // });
+
+ // �씠硫붿씪 蹂대궦�썑 �긽�꽭�솕硫� 媛깆떊
+ $rootScope.$on("getIssueDetail", function (event, args) {
+ $scope.fn.getIssueDetail();
+ });
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
// $scope.$on("getIssueDetail", function (event, args) {
@@ -1088,9 +1093,6 @@
partners : partners,
issueId : $scope.vm.viewer.id,
projectId : $scope.vm.viewer.projectVo.id,
- // companyVos : $scope.vm.viewer.issueCompanyVos,
- // ispVos : $scope.vm.viewer.issueIspVos,
- // hosingVos : $scope.vm.viewer.issueHostingVos,
}
}
});
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index a6a44a2..c529916 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -82,6 +82,7 @@
if (result.data.message.status === "success") {
SweetAlert.success($filter("translate")("issue.succeededIssueMail"), $filter("translate")("issue.sentToTheSelectedUser")); // "�씠�뒋 硫붿씪 諛쒖넚 �셿猷�"
$scope.fn.cancel();
+ $rootScope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId});
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueMail"), result.data.message.message); // "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣"
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 13f14d8..ed4011a 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -36,7 +36,7 @@
<label class="issue-detail-label">�씠硫붿씪 �뀥�뵆由�</label>
<div class="mt-20">
<img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
- <img id="ISSUE_SEND_2" class="TemplateIMG ml-30 mr-30" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
+ <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
<img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
</div>
<input class="btn-toggled btn-primary table-bordered" style="float: left" type="button" value="�뀥�뵆由�" ng-click="fn.showEmailTemplate()">
--
Gitblit v1.8.0