From 490aff099ae78fd76b5e3d6470541f8ce13286ec Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 28 1월 2022 14:06:40 +0900
Subject: [PATCH] - 이메일 보내는 사람 이름 설정 가능하게 수정 - 이슈 엑셀 임포트 시 프로젝트 선택하면 상위이슈 값 초기화 - 엑셀 임포트 시 띄어쓰기 공백 제거
---
src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java | 3 +++
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 4 +++-
src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java | 5 ++++-
src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java | 5 ++++-
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js | 2 +-
src/main/webapp/scripts/app/issue/issueImportExcel.controller.js | 1 +
src/main/resources/system_dev.properties | 1 +
7 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
index 82957da..679842c 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/CompanyFieldServiceImpl.java
@@ -443,7 +443,10 @@
* @return boolean
*/
private Boolean cellNullCheck (Cell cell) {
- return cell != null && cell.getStringCellValue() != null && cell.getCellType() != Cell.CELL_TYPE_BLANK;
+ if (cell != null && cell.getStringCellValue() != null) {
+ cell.setCellValue(cell.getStringCellValue().trim());//�� 媛� 怨듬갚 �젣嫄�
+ }
+ return cell != null && cell.getStringCellValue() != null && !cell.getStringCellValue().equals("") && cell.getCellType() != Cell.CELL_TYPE_BLANK;
}
private void telTypeCheck (Cell cell, int rowIndex) {
diff --git a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
index 8d3e1be..cf3863f 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/IssueServiceImpl.java
@@ -3455,6 +3455,9 @@
* @return boolean
*/
private Boolean cellNullCheck (Cell cell) {
+ if (cell != null && cell.getStringCellValue() != null) {
+ cell.setCellValue(cell.getStringCellValue().trim());//�� 媛� 怨듬갚 �젣嫄�
+ }
return cell != null && cell.getStringCellValue() != null && !cell.getStringCellValue().equals("") && cell.getCellType() != Cell.CELL_TYPE_BLANK;
}
diff --git a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
index 96a594e..92d20d5 100644
--- a/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
+++ b/src/main/java/kr/wisestone/owl/service/impl/SystemEmailServiceImpl.java
@@ -78,6 +78,9 @@
@Value("${email.userName}")
private String emailUserName;
+ @Value("${email.sender}")
+ private String emailSender;
+
// �씠硫붿씪 利됱떆 �쟾�넚
@Async
@Override
@@ -266,7 +269,7 @@
MimeMessage message = this.javaMailSender.createMimeMessage();
try {
- InternetAddress from = new InternetAddress(this.emailUserName, "OWL-ITS");
+ InternetAddress from = new InternetAddress(this.emailUserName, this.emailSender);
MimeMessageHelper messageHelper = new MimeMessageHelper(message, true, "utf-8");
messageHelper.setSubject(subject);
messageHelper.setText(content, true);
diff --git a/src/main/resources/system_dev.properties b/src/main/resources/system_dev.properties
index 7b4c115..8e517fe 100644
--- a/src/main/resources/system_dev.properties
+++ b/src/main/resources/system_dev.properties
@@ -41,6 +41,7 @@
# email \uC124\uC815
email.host=mail.g2works.kr
email.port=587
+email.sender=OWL-ITS
email.userName=supportowl@wisestone.kr
email.password=Stone0620**
email.transport.protocol=smtp
diff --git a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
index 5d5fa69..970a9ff 100644
--- a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
+++ b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
@@ -227,7 +227,7 @@
function toggleDropdown() {
// �븘�씠�뀥�씠 �꽑�깮�릺�뼱 �엳�쓣 寃쎌슦 紐⑸줉 �젅�씠�뼱�뒗 �몴�떆�맆 �닔 �뾾�떎.
$scope.open = true;
- if ($rootScope.isDefined($scope.selectedModel) && $scope.selectedModel.length > 0) {
+ if ($rootScope.isDefined($scope.search) && $rootScope.isDefined($scope.selectedModel) && $scope.selectedModel.length > 0) {
$scope.open = false;
$scope.options = [];
}
diff --git a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
index fd718ff..94f3dcb 100644
--- a/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueImportExcel.controller.js
@@ -52,6 +52,7 @@
$scope.$on("projectListEvent", function (event, result) {
$scope.vm.form.projects = result;
+ $scope.vm.form.issues = "";
$scope.fn.getIssueTypes();
});
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index a2e3381..c58387c 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -229,7 +229,9 @@
if (project.length < 1) {
SweetAlert.swal($filter("translate")("common.failedToIssueListLookUp"), $filter("translate")("common.selectToProjectListLookUp"), "error"); // "�봽濡쒖젥�듃瑜� 癒쇱� �꽑�깮 �빐 二쇱꽭�슂."
}
- projectIds.push(project[0].id);
+ if ($rootScope.isDefined(project[0])) {
+ projectIds.push(project[0].id);
+ }
}
return projectIds;
})()
--
Gitblit v1.8.0