hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-15 05:53:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9527 from DSpace/backport-9387-to-main

Browse Source 
[Port main] Fix #9383: Set email subject for request copy form
This commit is contained in:
Tim Donohue
2024-05-01 15:04:43 -05:00
committed by GitHub
parent 5c0d997577 e528ef4c4c
commit af4d28f665
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/core/Email.java
View File

@@ -395,7 +395,7 @@ public class Email {
for (String headerName : templateHeaders) { for (String headerName : templateHeaders) {
String headerValue = (String) vctx.get(headerName); String headerValue = (String) vctx.get(headerName);
if ("subject".equalsIgnoreCase(headerName)) { if ("subject".equalsIgnoreCase(headerName)) {
if (null != headerValue) { if ((subject == null || subject.isEmpty()) && null != headerValue) {
subject = headerValue; subject = headerValue;
} }
} else if ("charset".equalsIgnoreCase(headerName)) { } else if ("charset".equalsIgnoreCase(headerName)) {

6
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java
View File

@@ -247,11 +247,15 @@ public class RequestItemRepository
message = responseMessageNode.asText(); message = responseMessageNode.asText();
} }
JsonNode responseSubjectNode = requestBody.findValue("subject");
String subject = null;
if (responseSubjectNode != null && !responseSubjectNode.isNull()) {
subject = responseSubjectNode.asText();
}
ri.setDecision_date(new Date()); ri.setDecision_date(new Date());
requestItemService.update(context, ri); requestItemService.update(context, ri);
// Send the response email // Send the response email
String subject = requestBody.findValue("subject").asText();
try { try {
requestItemEmailNotifier.sendResponse(context, ri, subject, message); requestItemEmailNotifier.sendResponse(context, ri, subject, message);
} catch (IOException ex) { } catch (IOException ex) {