Skip to content
Snippets Groups Projects
Commit 769bd2e3 authored by Mike McKay's avatar Mike McKay
Browse files

XNAT-4463 Added message in cases where no project owners have valid emails....

XNAT-4463 Added message in cases where no project owners have valid emails. Hacked the UI to show this as an error message using Will's string contains hack. Hopefully we can get a better way to handle message type soon.
parent bc6a33eb
No related branches found
No related tags found
No related merge requests found
......@@ -84,6 +84,8 @@ public class RequestAccess extends SecureAction {
String from = XDAT.getSiteConfigPreferences().getAdminEmail();
String subject = TurbineUtils.GetSystemName() + " Access Request for " + project.getName();
data.setMessage("Access request sent.");
try {
XDAT.getMailService().sendHtmlMessage(from, to, null, bcc, subject, message);
} catch (Exception exception) {
......@@ -99,10 +101,10 @@ public class RequestAccess extends SecureAction {
}
if (successfulSends == 0) {
logger.error("Unable to send mail", exception);
data.setMessage("No project owners have emails which could receive the access request. Please contact the system administrator for additional assistance.");
}
}
data.setMessage("Access request sent.");
data.setScreenTemplate("Index.vm");
}
}
......@@ -12,7 +12,13 @@
$!template.setLayoutTemplate($siteConfig.getProperty("siteHomeLayout","/Index.vm"))
#end
#if ($data.message)
<div class="note">$data.message</div><br>
<div class="note" id="messageToDisplay">$data.message</div><br>
<script>
var messageToDisplay = "$data.message".toLowerCase();
if (messageToDisplay.indexOf('no project owners have emails which could receive the access request') > -1) {
$('#messageToDisplay').removeClass('note').addClass('error');
}
</script>
#end
#if(0 < $par_count)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment