Merge pull request #11 from christianapel/master

Add support for hierarchical projects and fix JENKINS-17734
jenkinsci · Nov 15, 2013 · d9c99ba · d9c99ba
2 parents 4cedc60 + a35265f
commit d9c99ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/src/main/java/hudson/plugins/claim/ClaimedBuildsReport.java b/src/main/java/hudson/plugins/claim/ClaimedBuildsReport.java
@@ -1,8 +1,6 @@
 package hudson.plugins.claim;
 
 import hudson.Extension;
-import hudson.model.TopLevelItem;
-import hudson.model.Hudson;
 import hudson.model.Job;
 import hudson.model.RootAction;
 import hudson.model.Run;
@@ -11,6 +9,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import jenkins.model.Jenkins;
 
 import org.kohsuke.stapler.Stapler;
 
@@ -59,22 +58,20 @@ public View getOwner() {
         if (view != null) {
             return view;
         } else {
-            return Hudson.getInstance().getView("All");
+            return Jenkins.getInstance().getStaplerFallback();
         }
     }
 
     public RunList getBuilds() {
         List<Run> lastBuilds = new ArrayList<Run>();
-        for (TopLevelItem item : getOwner().getItems()) {
-            if (item instanceof Job) {
-                Job job = (Job) item;
-                Run lb = job.getLastBuild();
-                while (lb != null && (lb.hasntStartedYet() || lb.isBuilding()))
-                    lb = lb.getPreviousBuild();
+        for (Job item : Jenkins.getInstance().getAllItems(Job.class)) {
+            Job job = (Job) item;
+            Run lb = job.getLastBuild();
+            while (lb != null && (lb.hasntStartedYet() || lb.isBuilding()))
+                lb = lb.getPreviousBuild();
 
-                if (lb != null && lb.getAction(ClaimBuildAction.class) != null) {
-                    lastBuilds.add(lb);
-                }
+            if (lb != null && lb.getAction(ClaimBuildAction.class) != null) {
+                lastBuilds.add(lb);
             }
         }
 

diff --git a/src/main/resources/hudson/plugins/claim/ClaimedBuildsReport/buildListTable.jelly b/src/main/resources/hudson/plugins/claim/ClaimedBuildsReport/buildListTable.jelly
@@ -25,7 +25,7 @@
           </a>
         </td>
         <td id="claim.build.${b.project.name}">
-          <a href="${rootURL}/${b.project.url}">${b.project.name}</a>
+          <a href="${rootURL}/${b.project.url}">${b.project.fullName}</a>
           <st:nbsp/>
           <a href="${rootURL}/${b.url}">#${b.number}</a>
         </td>