Merge pull request #1204 from daniel-beck/JENKINS-22698

daniel-beck · daniel-beck · commit afeacb527711 · 2014-05-11T01:24:59.000+02:00
[FIXED JENKINS-22698] Add indicator that build queue is filtered.
diff --git a/core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly b/core/src/main/resources/hudson/model/View/ajaxBuildQueue.jelly
@@ -28,6 +28,6 @@ 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">
   <l:ajax>
-    <t:queue items="${it.approximateQueueItemsQuickly}" />
+    <t:queue items="${it.approximateQueueItemsQuickly}" filtered="${it.isFilterQueue()}" />
   </l:ajax>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/widgets/BuildQueueWidget/index.groovy b/core/src/main/resources/jenkins/widgets/BuildQueueWidget/index.groovy
@@ -2,4 +2,4 @@ package jenkins.widgets.BuildQueueWidget;
 
 def t = namespace(lib.JenkinsTagLib.class)
 
-t.queue(items:view.approximateQueueItemsQuickly, it:view)
+t.queue(items:view.approximateQueueItemsQuickly, it:view, filtered:view.filterQueue)
diff --git a/core/src/main/resources/lib/hudson/queue.jelly b/core/src/main/resources/lib/hudson/queue.jelly
@@ -32,9 +32,20 @@ THE SOFTWARE.
       but for example you can specify a sublist after some filtering to narrow down
       the list.
     </st:attribute>
+    <st:attribute name="filtered" use="optional">
+      Indicates that the queue has been filtered, i.e. might not show all items.
+    </st:attribute>
   </st:documentation>
   <t:setIconSize/>
-  <l:pane title="${%Build Queue(items.size())}" width="2" id="buildQueue">
+  <j:choose>
+    <j:when test="${filtered}">
+      <j:set var="title" value="${%Filtered Build Queue(items.size())}" />
+    </j:when>
+    <j:otherwise>
+      <j:set var="title" value="${%Build Queue(items.size())}" />
+    </j:otherwise>
+  </j:choose>
+  <l:pane title="${title}" width="2" id="buildQueue">
     <j:if test="${app.quietingDown}">
       <tr>
         <td class="pane" colspan="2" style="white-space: normal;">
diff --git a/core/src/main/resources/lib/hudson/queue.properties b/core/src/main/resources/lib/hudson/queue.properties
@@ -1,2 +1,3 @@
 Build\ Queue=Build Queue{0,choice,0#|0< ({0,number})}
+Filtered\ Build\ Queue=Filtered Build Queue{0,choice,0#|0< ({0,number})}
 WaitingFor=Waiting for {0}

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ package jenkins.widgets.BuildQueueWidget;`
`2`	`2`
`3`	`3`	`def t = namespace(lib.JenkinsTagLib.class)`
`4`	`4`
`5`		`-t.queue(items:view.approximateQueueItemsQuickly, it:view)`
	`5`	`+t.queue(items:view.approximateQueueItemsQuickly, it:view, filtered:view.filterQueue)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`Build\ Queue=Build Queue{0,choice,0#\|0< ({0,number})}`
	`2`	`+Filtered\ Build\ Queue=Filtered Build Queue{0,choice,0#\|0< ({0,number})}`
`2`	`3`	`WaitingFor=Waiting for {0}`