[FIXED JENKINS-17454] Display parameters of queue items in build hist…

…ory widget. Also provide proper overrides of ParameterValue.getShortDescription, rather than delegating to toString.
jenkinsci · Apr 3, 2013 · 750da1a · 750da1a
1 parent d2603be
commit 750da1a
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -58,6 +58,9 @@
   <li class=bug>
     JUnit result archiver should only fail builds if there are really no results - i.e. also no skipped tests.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7970">issue 7970</a>)
+  <li class=rfe>
+    Better display of parameters in queue items.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17454">issue 17454</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/model/BooleanParameterValue.java b/core/src/main/java/hudson/model/BooleanParameterValue.java
@@ -90,4 +90,9 @@ public int hashCode() {
     public String toString() {
     	return "(BooleanParameterValue) " + getName() + "='" + value + "'";
     }
-}
+
+    @Override public String getShortDescription() {
+        return name + '=' + value;
+    }
+
+}
diff --git a/core/src/main/java/hudson/model/FileParameterValue.java b/core/src/main/java/hudson/model/FileParameterValue.java
@@ -175,6 +175,10 @@ public String toString() {
     	return "(FileParameterValue) " + getName() + "='" + originalFileName + "'";
     }
 
+    @Override public String getShortDescription() {
+        return name + "=" + originalFileName;
+    }
+
     /**
      * Serve this file parameter in response to a {@link StaplerRequest}.
      *

diff --git a/core/src/main/java/hudson/model/JobParameterValue.java b/core/src/main/java/hudson/model/JobParameterValue.java
@@ -46,4 +46,8 @@ public void buildEnvVars(AbstractBuild<?,?> build, EnvVars env) {
         env.put(name,job.toString());
         env.put(name.toUpperCase(Locale.ENGLISH),job.toString()); // backward compatibility pre 1.345
     }
+
+    @Override public String getShortDescription() {
+        return name + "=" + job.getFullDisplayName();
+    }
 }
diff --git a/core/src/main/java/hudson/model/PasswordParameterValue.java b/core/src/main/java/hudson/model/PasswordParameterValue.java
@@ -72,4 +72,9 @@ public boolean isSensitive() {
     public Secret getValue() {
         return value;
     }
+
+    @Override public String getShortDescription() {
+        return name + "=****";
+    }
+
 }
diff --git a/core/src/main/java/hudson/model/RunParameterValue.java b/core/src/main/java/hudson/model/RunParameterValue.java
@@ -91,4 +91,8 @@ public String toString() {
     	return "(RunParameterValue) " + getName() + "='" + getRunId() + "'";
     }
 
+    @Override public String getShortDescription() {
+        return name + "=" + getRun().getFullDisplayName();
+    }
+
 }
diff --git a/core/src/main/java/hudson/model/StringParameterValue.java b/core/src/main/java/hudson/model/StringParameterValue.java
@@ -96,4 +96,9 @@ public boolean equals(Object obj) {
     public String toString() {
     	return "(StringParameterValue) " + getName() + "='" + value + "'";
     }
+
+    @Override public String getShortDescription() {
+        return name + '=' + value;
+    }
+
 }
diff --git a/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly b/core/src/main/resources/hudson/widgets/BuildHistoryWidget/entries.jelly
@@ -56,6 +56,7 @@ THE SOFTWARE.
               (${%pending})
             </j:otherwise>
           </j:choose>
+          ${item.params}
         </td>
       </tr>
     </j:forEach>

diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
@@ -65,6 +65,7 @@ THE SOFTWARE.
                   <a href="${rootURL}/${item.task.url}" class="model-link tl-tr" tooltip="${item.why}${h.escape(item.params)}&lt;br&gt;${%WaitingFor(item.inQueueForString)}">
                     ${item.task.fullDisplayName}
                   </a>
+                  <!-- XXX include estimated number as in BuildHistoryWidget/entries.jelly if possible -->
                   <j:if test="${stuck}">
                     &#160;
                     <a href="http://wiki.jenkins-ci.org/display/JENKINS/Executor+Starvation">