From 8e535752d798b9ecfe4d8b6f864f1cd4f989a70e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 일, 05 12월 2021 17:44:11 +0900
Subject: [PATCH] 이메일 수정
---
src/main/webapp/assets/images/emailthumb-domain.png | 0
src/main/webapp/assets/images/emailthumb-hosting.png | 0
src/main/webapp/assets/images/emailthumb-badcode.png | 0
src/main/webapp/scripts/app/common/common.controller.js | 12 ++++--
src/main/webapp/views/issue/issueSendMailPartners.html | 6 +-
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 2
src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js | 47 +++++++----------------
7 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/assets/images/emailTemplate1.png b/src/main/webapp/assets/images/emailthumb-badcode.png
similarity index 100%
rename from src/main/webapp/assets/images/emailTemplate1.png
rename to src/main/webapp/assets/images/emailthumb-badcode.png
Binary files differ
diff --git a/src/main/webapp/assets/images/emailTemplate2.png b/src/main/webapp/assets/images/emailthumb-domain.png
similarity index 100%
rename from src/main/webapp/assets/images/emailTemplate2.png
rename to src/main/webapp/assets/images/emailthumb-domain.png
Binary files differ
diff --git a/src/main/webapp/assets/images/emailTemplate3.png b/src/main/webapp/assets/images/emailthumb-hosting.png
similarity index 100%
rename from src/main/webapp/assets/images/emailTemplate3.png
rename to src/main/webapp/assets/images/emailthumb-hosting.png
Binary files differ
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index fd7f242..4216e9c 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -86,7 +86,7 @@
moveMenu("issues.list");
}
}
- moveMenu("issues.list");
+ //moveMenu("issues.list");
//$rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
@@ -96,7 +96,7 @@
}
function moveMenu(stateName) {
- if ($state.current.name == stateName) {
+ if ($state.current.name === stateName) {
$state.reload();
} else {
$state.go(stateName);
@@ -260,15 +260,19 @@
if (issueType.id === $rootScope.user.lastIssueTypeId) {
selectIssueTypeId = issueType.id;
$scope.fn.changeIssueListMenu(issueType.id, false);
+ $state.go('dashboards.dashboard');
}
if (selectIssueTypeId == null) {
$scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id, false);
+
}
});
- } else {
- $state.go('dashboards.dashboard');
}
+ // ���돩蹂대뱶濡� 媛��뒗�뜲 �봽濡쒖젥�듃瑜� �깮�꽦�븯嫄곕굹 �닔�젙�빐�룄 嫄몃━�뒗 議곌굔�씠�떎.
+ // else {
+ // $state.go('dashboards.dashboard');
+ // }
}
else {
SweetAlert.error($filter("translate")("managementType.failedToIssueTypeList"), result.data.message.message); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index deb92af..7dd4755 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -876,7 +876,7 @@
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
- if ($rootScope.workProject.id > -1) {
+ if ($rootScope.workProject.id > -1 && result.data.data.projectVo !== null) {
$rootScope.changeLastProject(result.data.data.projectVo.id);
}
}
diff --git a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
index c40379b..683d4f0 100644
--- a/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueSendMailPartners.controller.js
@@ -136,41 +136,24 @@
}
}
- const div1 = document.getElementById('Email-Template1');
- const div2 = document.getElementById('Email-Template2');
- const div3 = document.getElementById('Email-Template3');
- const div4 = document.getElementById('Email-Template4');
+ // for(let i = 0 ; i <= 3 ; i++){
+ // $('#ISSUE_SEND_'+i).click(function(){
+ // $('#Email-Template'+i,'#Email-Template4').slideToggle('slow');
+ // });
+ // }
+ $("#ISSUE_SEND_1").click(function () {
+ $("#Email-Template1,#Email-Template4").slideToggle(0);
+ });
- if(div1.style.display === 'none' && div4.style.display === 'none') {
- div1.style.display = 'block';
- div4.style.display = 'block';
- } else if (div1.style.display === 'block' && div4.style.display === 'block') {
- div1.style.display = 'none';
- div4.style.display = 'none';
- }
+ $("#ISSUE_SEND_2").click(function () {
+ $("#Email-Template2,#Email-Template4").slideToggle(0);
+ });
- if (div2.style.display === 'none' && div4.style.display === 'none') {
- div2.style.display = 'block';
- div4.style.display = 'block'
- } else if (div2.style.display === 'block' && div4.style.display === 'block'){
- div2.style.display = 'none';
- div4.style.display = 'none'
- }
-
- if (div3.style.display == 'none' && div4.style.display === 'none') {
- div3.style.display = 'block';
- div4.style.display = 'block';
- } else if (div3.style.display === 'block' && div4.style.display === 'block'){
- div3.style.display = 'none';
- div4.style.display = 'none';
- }
-
- if (div4.style.display == 'none' || div4.style.display === 'block') {
- div4.style.display = 'block';
- } else {
- div4.style.display = 'none';
- }
+ $("#ISSUE_SEND_3").click(function() {
+ $("#Email-Template3,#Email-Template4").slideToggle(0);
+ });
}
}]);
+
});
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 4833e23..d1ff4ac 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -35,9 +35,9 @@
<div class="Template-area mt-20">
<label class="issue-detail-label">�씠硫붿씪 �뀥�뵆由�</label>
<div class="mt-10">
- <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/emailTemplate1.png" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
- <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/emailTemplate2.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
- <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/emailTemplate3.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
+ <img id="ISSUE_SEND_1" class="TemplateIMG1" src="assets/images/emailthumb-badcode.png" ng-click="fn.changeTemplate('ISSUE_SEND_1')">
+ <img id="ISSUE_SEND_2" class="TemplateIMG2" src="assets/images/emailthumb-domain.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')">
+ <img id="ISSUE_SEND_3" class="TemplateIMG3" src="assets/images/emailthumb-hosting.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')">
<div>
<span class="email_font">�븙�꽦肄붾뱶</span>
<span class="email_font offset-detail-3">�룄硫붿씤</span>
--
Gitblit v1.8.0