[FIXED JENKINS-19219] Upgrading to dashboard-view 2.9 causes Jobs Gri…

…d information to not be displayed. use default value of "Number of columns" if user does not configure portlet.
jenkinsci · Aug 16, 2013 · d5b3a9f · d5b3a9f
1 parent d434bdb
commit d5b3a9f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/main/java/hudson/plugins/view/dashboard/core/JobsPortlet.java b/src/main/java/hudson/plugins/view/dashboard/core/JobsPortlet.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import hudson.Extension;
-import hudson.model.TopLevelItem;
 import hudson.model.Descriptor;
 import hudson.model.Job;
 import hudson.plugins.view.dashboard.DashboardPortlet;
@@ -19,20 +18,22 @@
  */
 public class JobsPortlet extends DashboardPortlet {
 
-   private int columnCount = 3;
+   private static final int MIN_COLUMNCOUNT = 3;
+
+   private int columnCount;
    private boolean fillColumnFirst = false;
 
    @DataBoundConstructor
    public JobsPortlet(String name,
                       int columnCount,
                       boolean fillColumnFirst) {
       super(name);
-      this.columnCount = columnCount;
+      this.columnCount = columnCount <= 0 ? MIN_COLUMNCOUNT : columnCount;
       this.fillColumnFirst = fillColumnFirst;
    }
 
    public int getColumnCount() {
-      return this.columnCount <= 0 ? 3 : this.columnCount;
+      return columnCount;
    }
 
    public int getRowCount() {
@@ -50,7 +51,7 @@ public boolean getFillColumnFirst() {
 
    public Job getJob(int curRow, int curColumun){
       List<Job> jobs = this.getDashboard().getJobs();
-      int idx = 0;
+      int idx;
       // get grid coordinates from given params
       if (this.fillColumnFirst){
          idx = curRow + curColumun * this.getRowCount();
@@ -70,6 +71,10 @@ public Job getJob(int curRow, int curColumun){
    @Extension
    public static class DescriptorImpl extends Descriptor<DashboardPortlet> {
 
+      public int getDefaultCoulmnCount() {
+          return MIN_COLUMNCOUNT;
+      } 
+
       @Override
       public String getDisplayName() {
          return Messages.Dashboard_JobsGrid();

diff --git a/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/config.jelly b/src/main/resources/hudson/plugins/view/dashboard/core/JobsPortlet/config.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
     <f:textbox name="portlet.name" field="name" default="${descriptor.getDisplayName()}" />
   </f:entry>
   <f:entry title="${%Number of columns}">
-    <f:textbox name="portlet.columnCount" field="columnCount" />
+    <f:textbox name="portlet.columnCount" field="columnCount" default="${descriptor.getDefaultCoulmnCount()}" />
   </f:entry>
   <f:block>
     <f:checkbox name="portlet.fillColumnFirst" field="fillColumnFirst" />