From 02fee60349a2deabc444b35c12f8adf24e752903 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Wed, 2 Aug 2023 16:44:55 +0200 Subject: [PATCH 1/3] Extend success message after enabling monitoring The message hinting the user to open the required ports and pointing to the documentation was added. Signed-off-by: Witek Bedyk --- .../action/systems/sdc/SystemDetailsEditAction.java | 6 ++++-- .../rhn/frontend/strings/java/StringResource_en_US.xml | 2 +- .../suse/manager/webui/utils/UserPreferenceUtils.java | 10 ++++++++++ java/spacewalk-java.changes | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java index 144424e0c43e..748b4540694b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java @@ -39,6 +39,7 @@ import com.suse.manager.maintenance.MaintenanceManager; import com.suse.manager.model.maintenance.MaintenanceSchedule; import com.suse.manager.webui.services.pillar.MinionPillarManager; +import com.suse.manager.webui.utils.UserPreferenceUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -296,9 +297,10 @@ private boolean applyAddonEntitlementChanges(HttpServletRequest request, log.debug("adding entitlement success msg"); if (ConfigDefaults.get().isDocAvailable()) { - createSuccessMessage(request, + createMessage(request, "system.entitle.added." + e.getLabel(), - s.getId().toString()); + s.getId().toString(), + GlobalInstanceHolder.USER_PREFERENCE_UTILS.getDocsLocale(user)); } else { createSuccessMessage(request, diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index cf6859a213dc..7d3c257f3c4c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -9061,7 +9061,7 @@ Alternatively, you will want to download <strong>Incremental Channel Conte - <strong>Monitoring</strong> type has been applied.<br/><strong>Note:</strong> Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the <a href="/rhn/manager/systems/details/highstate?sid={0}">Highstate</a> in order to install and enable the Prometheus metrics exporters. + <strong>Monitoring</strong> type has been applied.<br/><strong>Note:</strong> Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the <a href="/rhn/manager/systems/details/highstate?sid={0}">Highstate</a> in order to install and enable the Prometheus metrics exporters.<br/><strong>Note:</strong> Please make sure to open the <a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports">required network ports</a> for all installed exporters. /rhn/systems/details/Overview.do diff --git a/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java b/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java index 7dc6c7cc852e..ca70e47c817a 100644 --- a/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java +++ b/java/code/src/com/suse/manager/webui/utils/UserPreferenceUtils.java @@ -104,6 +104,16 @@ public String getDocsLocale(PageContext pageContext) { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); User user = new RequestContext(request).getCurrentUser(); + return getDocsLocale(user); + } + + /** + * Get the user's configured documentation locale. If no user is available return the config default + * + * @param user the current user + * @return the users documentation locale + */ + public String getDocsLocale(User user) { if (isUserAuthenticated(user)) { String locale = user.getPreferredDocsLocale(); if (locale != null) { diff --git a/java/spacewalk-java.changes b/java/spacewalk-java.changes index 26e605edb391..52517d8c4498 100644 --- a/java/spacewalk-java.changes +++ b/java/spacewalk-java.changes @@ -1,3 +1,4 @@ +- Extend success message after adding monitoring property (bsc#1212168) - show error message in action result even on parser error - cache debian package metadata snippets in DB - Fixed a bug that caused the tab Autoinstallation to hide when clicking on Power From 4d36b6b4cd4a1abed1b9e8bb38d008ac1b5a4621 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Fri, 4 Aug 2023 15:22:32 +0200 Subject: [PATCH 2/3] Fix changelog Signed-off-by: Witek Bedyk --- java/spacewalk-java.changes | 1 - java/spacewalk-java.changes.witek.update_monitoring_added | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 java/spacewalk-java.changes.witek.update_monitoring_added diff --git a/java/spacewalk-java.changes b/java/spacewalk-java.changes index 52517d8c4498..26e605edb391 100644 --- a/java/spacewalk-java.changes +++ b/java/spacewalk-java.changes @@ -1,4 +1,3 @@ -- Extend success message after adding monitoring property (bsc#1212168) - show error message in action result even on parser error - cache debian package metadata snippets in DB - Fixed a bug that caused the tab Autoinstallation to hide when clicking on Power diff --git a/java/spacewalk-java.changes.witek.update_monitoring_added b/java/spacewalk-java.changes.witek.update_monitoring_added new file mode 100644 index 000000000000..80f5b5551608 --- /dev/null +++ b/java/spacewalk-java.changes.witek.update_monitoring_added @@ -0,0 +1 @@ +- Extend success message after adding monitoring property (bsc#1212168) From 9d6e862b4fed8a279be76c89fc6c7304d8d48531 Mon Sep 17 00:00:00 2001 From: Witek Bedyk Date: Fri, 4 Aug 2023 15:52:57 +0200 Subject: [PATCH 3/3] Fix checkstyle error Signed-off-by: Witek Bedyk --- .../rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 1 - 1 file changed, 1 deletion(-) diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java index 748b4540694b..22f9260fdefb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java @@ -39,7 +39,6 @@ import com.suse.manager.maintenance.MaintenanceManager; import com.suse.manager.model.maintenance.MaintenanceSchedule; import com.suse.manager.webui.services.pillar.MinionPillarManager; -import com.suse.manager.webui.utils.UserPreferenceUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger;