[FIXED JENKINS-23525]

Crash when using Folders plugin: com.cloudbees.hudson.plugins.folder.Folder cannot be cast to hudson.model.Job
jenkinsci · Sep 18, 2015 · 312109b · 312109b
1 parent 58c4893
commit 312109b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/maps/hudson/plugin/xfpanel/XFPanelView.java b/src/main/java/maps/hudson/plugin/xfpanel/XFPanelView.java
@@ -23,6 +23,8 @@
 
 import javax.servlet.ServletException;
 
+import jenkins.model.Jenkins;
+
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
@@ -332,6 +334,13 @@ public Collection<XFPanelEntry> sort(Collection<Job<?, ?>> jobs) {
         }
         return Collections.emptyList();
     }
+
+    public Collection<Job<?, ?>> getPrioritySortedJobs() {
+			List<Job<?, ?>> allItems = null;
+			allItems = Jenkins.getInstance().getAllItems((Class<Job<?,?>>) (Class) Job.class);
+    	return getPrioritySortedJobs(allItems);
+    }
+
     public Collection<Job<?, ?>> getPrioritySortedJobs(Collection<Job<?, ?>> jobs) {
     	return getPrioritySortedJobs(jobs, true);
     }

diff --git a/src/main/resources/maps/hudson/plugin/xfpanel/XFPanelView/configure-entries.jelly b/src/main/resources/maps/hudson/plugin/xfpanel/XFPanelView/configure-entries.jelly
@@ -41,7 +41,6 @@
 				<ul class="checklist" id="allJobs">
 					<!-- Get a priority sorted list of jobs -->
 					<j:invoke method="getPrioritySortedJobs" var="prioJobs" on="${it}">
-					    <j:arg type="java.util.Collection" value="${app.items}" />
 					</j:invoke>
 					<j:invoke method="getItems" var="allItems" on="${it}">
 					</j:invoke>

diff --git a/src/main/resources/maps/hudson/plugin/xfpanel/XFPanelView/maindisplay.jelly b/src/main/resources/maps/hudson/plugin/xfpanel/XFPanelView/maindisplay.jelly
@@ -6,7 +6,7 @@
 	xmlns:i="jelly:fmt">
 
 	<style type="text/css">         
-	  #side-panel, #page-head { display: none; visibility: hidden; height: 0px;      }  
+	  #side-panel, #page-head, #main-panel-content h1 { display: none; visibility: hidden; height: 0px;      }  
 	</style>
 	<j:choose>
 		<j:when test="${empty(items)}">