Merge pull request #1253 from daniel-beck/ModelHyperlinkNote-MasterNode

Return correct URL to Jenkins master node

core/src/main/java/hudson/console/ModelHyperlinkNote.java

 package hudson.console;
 
 import hudson.Extension;
-import hudson.model.Item;
-import hudson.model.ModelObject;
-import hudson.model.Node;
-import hudson.model.Run;
-import hudson.model.User;
+import hudson.model.*;
+import jenkins.model.Jenkins;
 
 import java.io.IOException;
 import java.util.logging.Level;
@@ -37,7 +34,7 @@ public class ModelHyperlinkNote extends HyperlinkNote {
     }
 
     public static String encodeTo(Item item) {
-        return encodeTo(item,item.getDisplayName());
+        return encodeTo(item,item.getFullDisplayName());
     }
 
     public static String encodeTo(Item item, String text) {
@@ -49,7 +46,12 @@ public class ModelHyperlinkNote extends HyperlinkNote {
     }
 
     public static String encodeTo(Node node) {
-        return encodeTo("/computer/"+ node.getNodeName(), node.getDisplayName());
+        Computer c = node.toComputer();
+        if (c != null) {
+            return encodeTo("/" + c.getUrl(), node.getDisplayName());
+        }
+        String nodePath = node == Jenkins.getInstance() ? "(master)" : node.getNodeName();
+        return encodeTo("/computer/" + nodePath, node.getDisplayName());
     }
 
     public static String encodeTo(String url, String text) {

core/src/main/java/hudson/model/Computer.java

@@ -626,7 +626,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     public String getUrl() {
-        return "computer/" + Util.rawEncode(getDisplayName()) + "/";
+        return "computer/" + Util.rawEncode(getName()) + "/";
     }
 
     /**
@@ -865,7 +865,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
     }
 
     public String getSearchUrl() {
-        return "computer/"+nodeName;
+        return getUrl();
     }
 
     /**

core/src/main/java/hudson/model/Node.java

@@ -25,11 +25,7 @@
 package hudson.model;
 
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
-import hudson.Extension;
-import hudson.ExtensionPoint;
-import hudson.FilePath;
-import hudson.FileSystemProvisioner;
-import hudson.Launcher;
+import hudson.*;
 import hudson.model.Descriptor.FormException;
 import hudson.model.Queue.Task;
 import hudson.model.labels.LabelAtom;
@@ -103,7 +99,11 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
     }
 
     public String getSearchUrl() {
-        return "computer/"+getNodeName();
+        Computer c = toComputer();
+        if (c != null) {
+            return c.getUrl();
+        }
+        return "computer/" + Util.rawEncode(getNodeName());
     }
 
     public boolean isHoldOffLaunchUntilSave() {