rtyler
/
blueocean-plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UX-533# Don't recurse in to sub folders

This commit is contained in:
Vivek Pandey 2016-06-03 07:52:08 -07:00
parent 070bb9b39c
commit c1f692c927
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/rest/PipelineContainerImpl.java
View File

@ -4,6 +4,7 @@ import hudson.model.BuildableItem;
import hudson.model.Item;
import hudson.model.ItemGroup;
import hudson.model.Job;
import hudson.model.TopLevelItem;
import io.jenkins.blueocean.commons.ServiceException;
import io.jenkins.blueocean.rest.model.BluePipeline;
import io.jenkins.blueocean.rest.model.BluePipelineContainer;
@ -63,7 +64,7 @@ public class PipelineContainerImpl extends BluePipelineContainer {
if(itemGroup != null){
return getPipelines(itemGroup.getItems());
}else{
return getPipelines(Jenkins.getActiveInstance().getAllItems(Item.class));
return getPipelines(Jenkins.getActiveInstance().getItems(TopLevelItem.class));
}
}
@ -71,7 +72,7 @@ public class PipelineContainerImpl extends BluePipelineContainer {
return item instanceof WorkflowJob && item.getParent() instanceof MultiBranchProject;
}
protected static Iterator<BluePipeline> getPipelines(Collection<Item> items){
protected static Iterator<BluePipeline> getPipelines(Collection<? extends Item> items){
List<BluePipeline> pipelines = new ArrayList<>();
for (Item item : items) {
if(item instanceof MultiBranchProject){

4
blueocean-rest-impl/src/test/java/io/jenkins/blueocean/service/embedded/PipelineApiTest.java
View File

@ -50,6 +50,10 @@ public class PipelineApiTest extends BaseTest {
MockFolder folder3 = folder1.createProject(MockFolder.class, "folder3");
Project p2 = folder2.createProject(FreeStyleProject.class, "test2");
List<Map> topFolders = get("/organizations/jenkins/pipelines/", List.class);
Assert.assertEquals(1, topFolders.size());
Map response = get("/organizations/jenkins/pipelines/folder1/pipelines/folder2/test2");
validatePipeline(p2, response);