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

Rework message to make it more useful, more businesslike, not expose author's email by default.

Browse Source
This commit is contained in:
Mark H. Wood
2023-06-14 10:17:20 -04:00
parent 4c00e13b52
commit 4abcfc8bf3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
View File

@@ -178,7 +178,7 @@ public class RequestItemEmailNotifier {
Email email = Email.getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(), Email email = Email.getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(),
"request_item.granted")); "request_item.granted"));
email.addArgument(ri.getReqName()); // {0} requestor's name email.addArgument(ri.getReqName()); // {0} requestor's name
email.addArgument(ri.getItem().getID().toString()); // {1} URL of the requested Item email.addArgument(handleService.getCanonicalForm(ri.getItem().getHandle())); // {1} URL of the requested Item
email.addArgument(ri.getItem().getName()); // {2} title of the requested Item email.addArgument(ri.getItem().getName()); // {2} title of the requested Item
email.addArgument(grantorName); // {3} name of the grantor email.addArgument(grantorName); // {3} name of the grantor
email.addArgument(grantorAddress); // {4} email of the grantor email.addArgument(grantorAddress); // {4} email of the grantor

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java
View File

@@ -27,7 +27,7 @@ import org.springframework.context.annotation.Configuration;
// bean which is in the scope of both will be duplicated. dspace-services makes // bean which is in the scope of both will be duplicated. dspace-services makes
// its context the parent of this one. If a bean is explicitly configured in // its context the parent of this one. If a bean is explicitly configured in
// the parent, it won't be so configured in this context and you may have // the parent, it won't be so configured in this context and you may have
// trouble. IOW be careful what you add here. // trouble. Be careful what you add here.
@ComponentScan( { @ComponentScan( {
"org.dspace.app.rest.converter", "org.dspace.app.rest.converter",
"org.dspace.app.rest.repository", "org.dspace.app.rest.repository",

12
dspace/config/emails/request_item.granted
View File

@@ -11,16 +11,16 @@
#set($subject = 'Request for Copy of Restricted Document is Granted') #set($subject = 'Request for Copy of Restricted Document is Granted')
Dear ${params[0]}: Dear ${params[0]}:
In response to your request I have the pleasure to send you in attachment a copy of the file(s) concerning the document: Your request for a copy of the file(s) from the below document has been approved by ${params[3]}. You may find the requested file(s) attached.
${params[2]} ${params[2]}
${params[1]} ${params[1]}
of which I am an author.
#if( $params[5] ) #if( $params[5] )
An additional message from ${params[3]} follows:
${params[5]} ${params[5]}
#end #end
Best regards, Best regards,
${params[3]} <${params[4]}> The ${config.get('dspace.name')} Team