From 217f5fd37198ba69def9c478564b138daac6ed59 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 24 Mar 2016 15:00:36 +0000 Subject: [PATCH] removed Email Notification, refactored the email subject git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portal/invites-common-library@126252 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../java/org/gcube/portal/invites/InvitesManager.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/gcube/portal/invites/InvitesManager.java b/src/main/java/org/gcube/portal/invites/InvitesManager.java index 5c22aa6..f8c8ce8 100644 --- a/src/main/java/org/gcube/portal/invites/InvitesManager.java +++ b/src/main/java/org/gcube/portal/invites/InvitesManager.java @@ -88,9 +88,10 @@ public class InvitesManager { InviteOperationResult result = null; boolean emailResult = false; try { + String vreName = aslSession.getGroupName(); result = store.saveInvite(invite); emailResult = sendInviteEmail(request, aslSession, portalSenderEmail, portalURL, name, lastName, email, vreDescription); - notifyInviteSent(username, aslSession.getScopeName(), portalURL, PortalContext.getConfiguration().getGatewayName(), invite); + notifyInviteSent(username, aslSession.getScopeName(), portalURL, PortalContext.getConfiguration().getGatewayName(), invite, vreName); } catch (AddressException e) { _log.error("Email not valid " + e.getMessage()); @@ -292,10 +293,9 @@ public class InvitesManager { * @param scope . * @param optionalMessage . */ - public static void notifyInviteSent(String username, String scope, String portalbasicurl, String gatewayName, Invite invite) { + public static void notifyInviteSent(String username, String scope, String portalbasicurl, String gatewayName, Invite invite, String vreName) { ArrayList adminEmails = getAdministratorsEmails(scope); - StringBuffer body = new StringBuffer(); body.append("

Dear manager of "+ scope +",
this email message was automatically generated by " + portalbasicurl +" to inform you that "); body.append("

"); @@ -307,8 +307,7 @@ public class InvitesManager { String[] allMails = new String[adminEmails.size()]; adminEmails.toArray(allMails); - EmailNotification mailToAdmin = new EmailNotification(allMails , "[" + gatewayName + "] - Sent Invitation", body.toString()); - + EmailNotification mailToAdmin = new EmailNotification(allMails , "An invite was sent on " + vreName + " by " + invite.getSenderFullName(), body.toString()); mailToAdmin.sendEmail(); }