From e0f0cd6762c80ee19415b6eab6f870644e786fb5 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Wed, 5 Mar 2008 02:03:49 +0000
Subject: [PATCH] Applied a patch for #1174, but after a refactoring to reuse
 the jelly fragment.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7320 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/Computer.java |  4 ++
 core/src/main/java/hudson/model/View.java     |  4 ++
 core/src/main/java/hudson/util/RunList.java   | 19 +++++++-
 .../hudson/model/Computer/builds.jelly        | 12 +++++
 .../hudson/model/Computer/sidepanel.jelly     |  1 +
 .../model/Slave/ComputerImpl/sidepanel.jelly  |  1 +
 .../resources/hudson/model/User/builds.jelly  | 40 +----------------
 .../resources/hudson/model/View/builds.jelly  | 12 +++++
 .../hudson/model/View/sidepanel.jelly         |  1 +
 .../resources/lib/hudson/buildListTable.jelly | 45 +++++++++++++++++++
 .../hudson/buildListTable_de.properties}      |  0
 .../hudson/buildListTable_fr.properties}      |  0
 .../hudson/buildListTable_ja.properties}      |  0
 .../hudson/buildListTable_pt_BR.properties}   |  0
 14 files changed, 99 insertions(+), 40 deletions(-)
 create mode 100644 core/src/main/resources/hudson/model/Computer/builds.jelly
 create mode 100644 core/src/main/resources/hudson/model/View/builds.jelly
 create mode 100644 core/src/main/resources/lib/hudson/buildListTable.jelly
 rename core/src/main/resources/{hudson/model/User/builds_de.properties => lib/hudson/buildListTable_de.properties} (100%)
 rename core/src/main/resources/{hudson/model/User/builds_fr.properties => lib/hudson/buildListTable_fr.properties} (100%)
 rename core/src/main/resources/{hudson/model/User/builds_ja.properties => lib/hudson/buildListTable_ja.properties} (100%)
 rename core/src/main/resources/{hudson/model/User/builds_pt_BR.properties => lib/hudson/buildListTable_pt_BR.properties} (100%)

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index d85d38e588..0397033077 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -171,6 +171,10 @@ public abstract class Computer extends AbstractModelObject {
     public List<AbstractProject> getTiedJobs() {
         return getNode().getSelfLabel().getTiedJobs();
     }
+    
+    public RunList getBuilds() {
+    	return new RunList(Hudson.getInstance().getAllItems(Job.class)).node(getNode());
+    }
 
     /**
      * Called to notify {@link Computer} that its corresponding {@link Node}
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index 0581ceb263..e4bac4b8d4 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -247,6 +247,10 @@ public abstract class View extends AbstractModelObject {
     public void doRssFailed( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException {
         rss(req, rsp, " failed builds", new RunList(this).failureOnly());
     }
+    
+    public RunList getBuilds() {
+    	return new RunList(this);
+    }
 
     private void rss(StaplerRequest req, StaplerResponse rsp, String suffix, RunList runs) throws IOException, ServletException {
         RSS.forwardToRss(getDisplayName()+ suffix, getUrl(),
diff --git a/core/src/main/java/hudson/util/RunList.java b/core/src/main/java/hudson/util/RunList.java
index 67dc8199b1..7ea765a294 100644
--- a/core/src/main/java/hudson/util/RunList.java
+++ b/core/src/main/java/hudson/util/RunList.java
@@ -1,10 +1,12 @@
 package hudson.util;
 
+import hudson.model.AbstractBuild;
+import hudson.model.Item;
 import hudson.model.Job;
+import hudson.model.Node;
 import hudson.model.Result;
 import hudson.model.Run;
 import hudson.model.View;
-import hudson.model.Item;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -59,6 +61,21 @@ public class RunList extends ArrayList<Run> {
         return this;
     }
 
+    /**
+     * Filter the list to builds on a single node only
+     */
+    public RunList node(Node node) {
+        for (Iterator<Run> itr = iterator(); itr.hasNext();) {
+            Run r = itr.next();
+            if (r instanceof AbstractBuild) {
+            	if (!((AbstractBuild) r).getBuiltOn().equals(node)) {
+                    itr.remove();
+            	}
+            }
+        }
+        return this;
+    }
+
     /**
      * Filter the list to regression builds only.
      */
diff --git a/core/src/main/resources/hudson/model/Computer/builds.jelly b/core/src/main/resources/hudson/model/Computer/builds.jelly
new file mode 100644
index 0000000000..97346738ed
--- /dev/null
+++ b/core/src/main/resources/hudson/model/Computer/builds.jelly
@@ -0,0 +1,12 @@
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+  <l:layout title="${it.displayName}">
+    <st:include page="sidepanel.jelly" />
+    <l:main-panel>
+      <h1>
+        <img src="${imagesURL}/48x48/notepad.gif" />
+        Build History on ${it.displayName}
+      </h1>
+      <t:buildListTable builds="${it.builds}"/>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
index d0e198c16b..6b57c2ee0f 100644
--- a/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Computer/sidepanel.jelly
@@ -6,6 +6,7 @@
   <l:side-panel>
     <l:tasks>
       <l:task icon="images/24x24/up.gif" href=".." title="Back to List" />
+      <l:task icon="images/24x24/notepad.gif" href="${rootURL}/${it.url}/builds" title="Build History" />
     </l:tasks>
   </l:side-panel>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/Slave/ComputerImpl/sidepanel.jelly b/core/src/main/resources/hudson/model/Slave/ComputerImpl/sidepanel.jelly
index e0cb9fa665..bf4d3a6cb7 100644
--- a/core/src/main/resources/hudson/model/Slave/ComputerImpl/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/Slave/ComputerImpl/sidepanel.jelly
@@ -7,6 +7,7 @@
     <l:tasks>
       <l:task icon="images/24x24/up.gif" href=".." title="Back to List" />
       <l:task icon="images/24x24/search.gif" href="${rootURL}/computer/${it.displayName}/" title="Status" />
+      <l:task icon="images/24x24/notepad.gif" href="${rootURL}/${it.url}/builds" title="Build History" />
       <l:isAdmin>
         <l:task icon="images/24x24/clipboard.gif" href="log" title="Log" />
         <l:task icon="images/24x24/computer.gif" href="systemInfo" title="System Information" />
diff --git a/core/src/main/resources/hudson/model/User/builds.jelly b/core/src/main/resources/hudson/model/User/builds.jelly
index 8aee85de02..480e9b025f 100644
--- a/core/src/main/resources/hudson/model/User/builds.jelly
+++ b/core/src/main/resources/hudson/model/User/builds.jelly
@@ -6,45 +6,7 @@
         <img src="${imagesURL}/48x48/user.gif" />
         Builds for ${it}
       </h1>
-
-      <t:setIconSize/>
-
-      <table class="pane sortable" id="projectStatus">
-        <tr>
-          <th><st:nbsp/></th>
-          <th>{$%Build}</th>
-          <th initialSortDir="up">${%Date}</th>
-          <th>${%Status}</th>
-          <th><st:nbsp/></th>
-        </tr>
-        <j:forEach var="b" items="${it.builds}">
-          <tr>
-            <td data="${b.iconColor.ordinal()}">
-              <a href="${rootURL}/${b.url}">
-                <img src="${imagesURL}/${iconSize}/${b.buildStatusUrl}"
-                     alt="${b.iconColor.description}"/>
-              </a>
-            </td>
-            <td>
-              <a href="${rootURL}/${b.project.url}">${b.project.name}</a>
-              <st:nbsp/>
-              <a href="${rootURL}/${b.url}">#${b.number}</a>
-            </td>
-            <td data="${b.timestampString2}">
-              ${b.timestampString}
-            </td>
-            <td>
-              <t:buildStatusSummary build="${b}" />
-            </td>
-            <td>
-              <a href="${rootURL}/${b.url}console">
-                <img src="${imagesURL}/${subIconSize}/terminal.gif" title="Console output" border="0" />
-              </a>
-            </td>
-          </tr>
-        </j:forEach>
-      </table>
-      <t:rssBar-with-iconSize/>
+      <t:buildListTable builds="${it.builds}"/>
     </l:main-panel>
   </l:layout>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/View/builds.jelly b/core/src/main/resources/hudson/model/View/builds.jelly
new file mode 100644
index 0000000000..6e6f1a1062
--- /dev/null
+++ b/core/src/main/resources/hudson/model/View/builds.jelly
@@ -0,0 +1,12 @@
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+  <l:layout title="${it.displayName}">
+    <st:include page="sidepanel.jelly" />
+    <l:main-panel>
+      <h1>
+        <img src="${imagesURL}/48x48/notepad.gif" />
+        Build History of ${it.displayName}
+      </h1>
+      <t:buildListTable builds="${it.builds}"/>
+    </l:main-panel>
+  </l:layout>
+</j:jelly>
diff --git a/core/src/main/resources/hudson/model/View/sidepanel.jelly b/core/src/main/resources/hudson/model/View/sidepanel.jelly
index cc259842dc..e001314b7a 100644
--- a/core/src/main/resources/hudson/model/View/sidepanel.jelly
+++ b/core/src/main/resources/hudson/model/View/sidepanel.jelly
@@ -15,6 +15,7 @@
       <j:if test="${it.hasPeople()}">
         <l:task icon="images/24x24/user.gif" href="${rootURL}/people/" title="${%People}" />
       </j:if>
+      <l:task icon="images/24x24/notepad.gif" href="${rootURL}/${it.url}builds" title="Build History"/>
       <st:include page="sidepanel2.jelly" />
       <t:actions />
     </l:tasks>
diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly
new file mode 100644
index 0000000000..9006fd70fc
--- /dev/null
+++ b/core/src/main/resources/lib/hudson/buildListTable.jelly
@@ -0,0 +1,45 @@
+<!--
+  Creates a table of builds.
+
+  Attribute:
+    @builds  a collection of builds to be displayed. required.
+-->
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+  <t:setIconSize/>
+  <table class="pane sortable" id="projectStatus">
+    <tr>
+      <th><st:nbsp/></th>
+      <th>${%Build}</th>
+      <th initialSortDir="up">${%Date}</th>
+      <th>${%Status}</th>
+      <th><st:nbsp/></th>
+    </tr>
+    <j:forEach var="b" items="${attrs.builds}">
+      <tr>
+        <td data="${b.iconColor.ordinal()}">
+          <a href="${rootURL}/${b.url}">
+            <img src="${imagesURL}/${iconSize}/${b.buildStatusUrl}"
+                 alt="${b.iconColor.description}"/>
+          </a>
+        </td>
+        <td>
+          <a href="${rootURL}/${b.project.url}">${b.project.name}</a>
+          <st:nbsp/>
+          <a href="${rootURL}/${b.url}">#${b.number}</a>
+        </td>
+        <td data="${b.timestampString2}">
+          ${b.timestampString}
+        </td>
+        <td>
+          <t:buildStatusSummary build="${b}" />
+        </td>
+        <td>
+          <a href="${rootURL}/${b.url}console">
+            <img src="${imagesURL}/${subIconSize}/terminal.gif" title="Console output" border="0" />
+          </a>
+        </td>
+      </tr>
+    </j:forEach>
+  </table>
+  <t:rssBar-with-iconSize/>
+</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/model/User/builds_de.properties b/core/src/main/resources/lib/hudson/buildListTable_de.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/User/builds_de.properties
rename to core/src/main/resources/lib/hudson/buildListTable_de.properties
diff --git a/core/src/main/resources/hudson/model/User/builds_fr.properties b/core/src/main/resources/lib/hudson/buildListTable_fr.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/User/builds_fr.properties
rename to core/src/main/resources/lib/hudson/buildListTable_fr.properties
diff --git a/core/src/main/resources/hudson/model/User/builds_ja.properties b/core/src/main/resources/lib/hudson/buildListTable_ja.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/User/builds_ja.properties
rename to core/src/main/resources/lib/hudson/buildListTable_ja.properties
diff --git a/core/src/main/resources/hudson/model/User/builds_pt_BR.properties b/core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties
similarity index 100%
rename from core/src/main/resources/hudson/model/User/builds_pt_BR.properties
rename to core/src/main/resources/lib/hudson/buildListTable_pt_BR.properties
-- 
GitLab