From 0971dee536469e3e3f4e8b1e75bf7dbdc57cdb5c Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sat, 31 Mar 2007 05:50:52 +0000 Subject: [PATCH] fixed #401. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@2811 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Computer.java | 4 ++++ core/src/main/java/hudson/model/Hudson.java | 13 +++++++++++++ .../resources/hudson/model/Computer/index.jelly | 2 +- core/src/main/resources/lib/hudson/executors.jelly | 14 ++++++++++++-- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index ff2e2748e6..2ace081b5f 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -140,6 +140,10 @@ public abstract class Computer implements ModelObject { return nodeName; } + public String getCaption() { + return "Slave "+nodeName; + } + public String getUrl() { return "computer/"+getDisplayName()+"/"; } diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index af08ef93db..8da75b319b 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -528,6 +528,9 @@ public final class Hudson extends View implements ItemGroup, Node } public Computer getComputer(String name) { + if(name.equals("(master)")) + name = ""; + for (Computer c : computers.values()) { if(c.getNode().getNodeName().equals(name)) return c; @@ -1444,6 +1447,16 @@ public final class Hudson extends View implements ItemGroup, Node super(Hudson.getInstance()); } + @Override + public String getDisplayName() { + return "master"; + } + + @Override + public String getCaption() { + return "Master"; + } + @Override public VirtualChannel getChannel() { return localChannel; diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly index f084243296..9f4287965d 100644 --- a/core/src/main/resources/hudson/model/Computer/index.jelly +++ b/core/src/main/resources/hudson/model/Computer/index.jelly @@ -16,7 +16,7 @@

- Slave ${it.displayName} + ${it.caption}

diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly index c5e462c363..123984f0c6 100644 --- a/core/src/main/resources/lib/hudson/executors.jelly +++ b/core/src/main/resources/lib/hudson/executors.jelly @@ -8,8 +8,18 @@ No. - Status - + + + + Status + + + Master + (offline) + + + +