Skip to content

Commit 6e97483

Browse files
committed
#24 Disable fetching notifications from NextGen notification service
Signed-off-by: Kaur Palang <kaur.palang@brightcodecompany.com>
1 parent ab83380 commit 6e97483

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

client/src/com/mirth/connect/client/ui/LoginPanel.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,8 @@ private boolean handleSuccess(LoginStatus loginStatus) throws ClientException {
608608
}
609609

610610
// Check for new notifications from update server if enabled
611-
String checkForNotifications = userPreferences.getProperty("checkForNotifications");
611+
// TODO Re-implement a notifications service. See https://github.com/OpenIntegrationEngine/engine/issues/24
612+
String checkForNotifications = "false"; // userPreferences.getProperty("checkForNotifications");
612613
if (checkForNotifications == null || BooleanUtils.toBoolean(checkForNotifications)) {
613614
Set<Integer> archivedNotifications = new HashSet<Integer>();
614615
String archivedNotificationString = userPreferences.getProperty("archivedNotifications");

client/src/com/mirth/connect/client/ui/SettingsPanelAdministrator.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,18 @@ public void doRefresh() {
181181

182182
SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
183183

184-
private String checkForNotifications = null;
184+
private String checkForNotifications = "false";
185185
private Color backgroundColor = null;
186186

187187
public Void doInBackground() {
188+
// TODO Re-implement a notifications service. See https://github.com/OpenIntegrationEngine/engine/issues/24
189+
/*
188190
try {
189191
checkForNotifications = getFrame().mirthClient.getUserPreference(currentUser.getId(), "checkForNotifications");
190192
} catch (ClientException e) {
191193
getFrame().alertThrowable(getFrame(), e);
192194
}
195+
*/
193196

194197
try {
195198
String backgroundColorStr = getFrame().mirthClient.getUserPreference(currentUser.getId(), UIConstants.USER_PREF_KEY_BACKGROUND_COLOR);
@@ -596,11 +599,13 @@ private void initComponents() {
596599
notificationButtonGroup = new ButtonGroup();
597600

598601
checkForNotificationsYesRadio = new MirthRadioButton("Yes");
602+
checkForNotificationsYesRadio.setEnabled(false);
599603
checkForNotificationsYesRadio.setBackground(userSettingsPanel.getBackground());
600604
checkForNotificationsYesRadio.setToolTipText("<html>Checks for notifications from NextGen Healthcare (announcements, available updates, etc.)<br/>relevant to this version of Mirth Connect whenever user logs in.</html>");
601605
notificationButtonGroup.add(checkForNotificationsYesRadio);
602606

603607
checkForNotificationsNoRadio = new MirthRadioButton("No");
608+
checkForNotificationsNoRadio.setEnabled(false);
604609
checkForNotificationsNoRadio.setBackground(userSettingsPanel.getBackground());
605610
checkForNotificationsNoRadio.setToolTipText("<html>Checks for notifications from NextGen Healthcare (announcements, available updates, etc.)<br/>relevant to this version of Mirth Connect whenever user logs in.</html>");
606611
notificationButtonGroup.add(checkForNotificationsNoRadio);

0 commit comments

Comments
 (0)