Skip to content

Commit 1f420dc

Browse files
authored
fix ehr tests that are enabling notifications (#186)
1 parent f9b1f61 commit 1f420dc

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

LDK/resources/web/LDK/panel/NotificationAdminPanel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Ext4.define('LDK.panel.NotificationAdminPanel', {
198198
helpPopup: 'This will be used as the reply email for all sent messages.',
199199
dataIndex: 'replyEmail',
200200
vtype: 'email',
201-
value: results.replyEmail.address
201+
value: results.replyEmail
202202
},{
203203
xtype: 'panel',
204204
border: false,

LDK/src/org/labkey/ldk/LDKController.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package org.labkey.ldk;
1818

19+
import jakarta.mail.Address;
1920
import jakarta.servlet.http.HttpServletResponse;
2021
import org.apache.commons.lang3.StringUtils;
2122
import org.apache.logging.log4j.LogManager;
@@ -125,7 +126,8 @@ public ApiResponse execute(Object form, BindException errors)
125126
User u = NotificationServiceImpl.get().getUser(getContainer());
126127
result.put("serviceEnabled", NotificationServiceImpl.get().isServiceEnabled());
127128
result.put("notificationUser", u == null ? null : u.getEmail());
128-
result.put("replyEmail", NotificationServiceImpl.get().getReturnEmail(getContainer()));
129+
Address replyEmail = NotificationServiceImpl.get().getReturnEmail(getContainer());
130+
result.put("replyEmail", replyEmail == null ? null : replyEmail.toString());
129131
result.put("success", true);
130132

131133
return new ApiSimpleResponse(result);

0 commit comments

Comments
 (0)