[FIXED JENKINS-20143] Pass full list of all possible jobs to ViewJobF…

…ilter when recurse option is set
jenkinsci · Oct 22, 2013 · 7115589 · jglick · Oct 22, 2013 · 7115589
1 parent f9f1483
commit 7115589
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/changelog.html b/changelog.html
@@ -56,6 +56,10 @@
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
   <li class=>
+  <li class=bug>
+    Pass full list of all possible jobs to ViewJobFilter when recurse option is set
+    (a href="https://issues.jenkins-ci.org/browse/JENKINS-20123">issue 20123</a>)
+  </li>
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/model/ListView.java b/core/src/main/java/hudson/model/ListView.java
@@ -175,6 +175,7 @@ public List<TopLevelItem> getItems() {
         // check the filters
         Iterable<ViewJobFilter> jobFilters = getJobFilters();
         List<TopLevelItem> allItems = new ArrayList<TopLevelItem>(parentItems);
+        if (recurse) allItems = expand(allItems, new ArrayList<TopLevelItem>());
     	for (ViewJobFilter jobFilter: jobFilters) {
     		items = jobFilter.filter(items, allItems, this);
     	}
@@ -183,6 +184,19 @@ public List<TopLevelItem> getItems() {
 
         return items;
     }
+
+    private List<TopLevelItem> expand(Collection<TopLevelItem> items, List<TopLevelItem> allItems) {
+        for (Item item : items) {
+            if (item instanceof ItemGroup) {
+                ItemGroup<TopLevelItem> ig = (ItemGroup<TopLevelItem>) item;
+                expand(ig.getItems(), allItems);
+            }
+            if (item instanceof TopLevelItem) {
+                allItems.add((TopLevelItem) item);
+            }
+        }
+        return allItems;
+    }
 
     @Override
     public boolean contains(TopLevelItem item) {