Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ehr tests that are enabling notifications #186

Merged
merged 2 commits into from
Feb 17, 2024
Merged

fix ehr tests that are enabling notifications #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0882d3
fix ehr tests that are enabling notifications
ankurjuneja Feb 15, 2024
5651559
Explicitly convert Address to String
labkey-jeckels Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LDK/resources/web/LDK/panel/NotificationAdminPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ Ext4.define('LDK.panel.NotificationAdminPanel', {
helpPopup: 'This will be used as the reply email for all sent messages.',
dataIndex: 'replyEmail',
vtype: 'email',
value: results.replyEmail.address
value: results.replyEmail
},{
xtype: 'panel',
border: false,
Expand Down
4 changes: 3 additions & 1 deletion LDK/src/org/labkey/ldk/LDKController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.labkey.ldk;

import jakarta.mail.Address;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
Expand Down Expand Up @@ -125,7 +126,8 @@ public ApiResponse execute(Object form, BindException errors)
User u = NotificationServiceImpl.get().getUser(getContainer());
result.put("serviceEnabled", NotificationServiceImpl.get().isServiceEnabled());
result.put("notificationUser", u == null ? null : u.getEmail());
result.put("replyEmail", NotificationServiceImpl.get().getReturnEmail(getContainer()));
Address replyEmail = NotificationServiceImpl.get().getReturnEmail(getContainer());
result.put("replyEmail", replyEmail == null ? null : replyEmail.toString());
result.put("success", true);

return new ApiSimpleResponse(result);
Expand Down