From 6220e9d7d7eb8567513a346d961ade96e55e4801 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Thu, 26 May 2016 13:23:42 -0500
Subject: [PATCH] XNAT-4274 Made smtp settings entered on setup persist
correctly.
---
.../rest/notifications/NotificationsApi.java | 5 +++++
.../xnat/spawner/site-setup-elements.yaml | 6 +++---
src/main/webapp/setup/site-setup.yaml | 20 +++++++++----------
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/nrg/xapi/rest/notifications/NotificationsApi.java b/src/main/java/org/nrg/xapi/rest/notifications/NotificationsApi.java
index 4db76cab..db69a9e3 100644
--- a/src/main/java/org/nrg/xapi/rest/notifications/NotificationsApi.java
+++ b/src/main/java/org/nrg/xapi/rest/notifications/NotificationsApi.java
@@ -67,6 +67,11 @@ public class NotificationsApi extends AbstractXnatRestApi {
preferences.put("siteUrl", XnatHttpUtils.getServerRoot(request));
}
+ preferences.put("notifications.emailRecipientErrorMessages",_notificationsPrefs.getEmailRecipientErrorMessages());
+ preferences.put("notifications.emailRecipientIssueReports",_notificationsPrefs.getEmailRecipientIssueReports());
+ preferences.put("notifications.emailRecipientNewUserAlert",_notificationsPrefs.getEmailRecipientNewUserAlert());
+ preferences.put("notifications.emailRecipientUpdate",_notificationsPrefs.getEmailRecipientUpdate());
+
return new ResponseEntity<>(preferences, HttpStatus.OK);
}
diff --git a/src/main/resources/META-INF/xnat/spawner/site-setup-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-setup-elements.yaml
index 4f826705..36e27b05 100644
--- a/src/main/resources/META-INF/xnat/spawner/site-setup-elements.yaml
+++ b/src/main/resources/META-INF/xnat/spawner/site-setup-elements.yaml
@@ -126,10 +126,10 @@ smtpServer:
label: SMTP Server Settings
footer: false
method: POST
- action: /xapi/siteConfig/smtpServer
+ action: /xapi/notifications/batchMail
contentType: json
- load: ?? XNAT.data.siteConfig.smtpServer
- refresh: /xapi/siteConfig/smtpServer
+ load: ?? XNAT.data.notifications
+ refresh: /xapi/notifications/
contents:
host:
diff --git a/src/main/webapp/setup/site-setup.yaml b/src/main/webapp/setup/site-setup.yaml
index fe5b262a..68ab6caa 100644
--- a/src/main/webapp/setup/site-setup.yaml
+++ b/src/main/webapp/setup/site-setup.yaml
@@ -140,17 +140,17 @@ siteSetup:
label: SMTP Server Settings
footer: false
method: POST
- action: /xapi/siteConfig/smtpServer
+ action: /xapi/notifications/batchMail
contentType: json
-# load: ?? XNAT.data.siteConfig.smtpServer
- refresh: /xapi/siteConfig/smtpServer
+# load: ?? XNAT.data.notifications
+ refresh: /xapi/notifications/
contents:
host:
kind: panel.input.text
name: host
label: Host
- value: ?? XNAT:data:siteConfig:smtpServer:host
+ value: ?? XNAT:data:notifications:host
# value: ""
placeholder: localhost
validation: required
@@ -159,7 +159,7 @@ siteSetup:
kind: panel.input.number
name: port
label: Port
- value: ?? XNAT:data:siteConfig:smtpServer:port
+ value: ?? XNAT:data:notifications:port
# value: ""
placeholder: 25
validation: required number
@@ -168,21 +168,21 @@ siteSetup:
kind: panel.input.text
name: username
label: Username
- value: ?? XNAT:data:siteConfig:smtpServer:username
+ value: ?? XNAT:data:notifications:username
# value: ""
password:
kind: panel.input.password
name: password
label: Password
- value: ?? XNAT:data:siteConfig:smtpServer:password
+ value: ?? XNAT:data:notifications:password
# value: ""
protocol:
kind: panel.input.text
name: protocol
label: Protocol
- value: ?? XNAT:data:siteConfig:smtpServer:protocol
+ value: ?? XNAT:data:notifications:protocol
# value: ""
mailServerProperties:
@@ -193,14 +193,14 @@ siteSetup:
kind: panel.input.checkbox
name: mail.smtp.auth
label: SMTP Auth?
- value: ?? XNAT:data:siteConfig:smtpServer:mail.smtp.auth
+ value: ?? XNAT:data:notifications:mail.smtp.auth
# value: ""
smtpStartTls:
kind: panel.input.checkbox
name: mail.smtp.starttls.enable
label: Smart TLS?
- value: ?? XNAT:data:siteConfig:smtpServer:mail.smtp.starttls.enable
+ value: ?? XNAT:data:notifications:mail.smtp.starttls.enable
# value: ""
smtpSSLTrust:
--
GitLab