Fix display issue with JVMVersion node monitor (#190)

jenkinsci · Oct 26, 2023 · 4fe4f71 · 4fe4f71
1 parent 74859c9
commit 4fe4f71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugin/versioncolumn/JVMVersionMonitor.java b/src/main/java/hudson/plugin/versioncolumn/JVMVersionMonitor.java
@@ -25,6 +25,7 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import hudson.Extension;
+import hudson.Util;
 import hudson.model.Computer;
 import hudson.node_monitors.AbstractAsyncNodeMonitorDescriptor;
 import hudson.node_monitors.NodeMonitor;
@@ -59,6 +60,14 @@ public boolean isDisconnect() {
         return disconnect;
     }
 
+    @SuppressWarnings("unused") // jelly
+    public String toHtml(String version) {
+        if (!version.equals("N/A") && !version.equals(CONTROLLER_VERSION.toString())) {
+            return Util.wrapToErrorSpan(version);
+        }
+        return version;
+    }
+
     @Override
     public Object data(Computer c) {
 

diff --git a/src/main/resources/hudson/plugin/versioncolumn/JVMVersionMonitor/column.jelly b/src/main/resources/hudson/plugin/versioncolumn/JVMVersionMonitor/column.jelly
@@ -24,5 +24,5 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
-      <td align="right" data="${data}">${data}</td>
+      <td align="right" data="${data}"><j:out value="${from.toHtml(data)}"/></td>
 </j:jelly>