[FIXED JENKINS-27613] - NPE in the layout due to the changes in View.…

…main.jelly implementation in the core
jenkinsci · Sep 27, 2015 · f8ba05b · f8ba05b
1 parent 850219b
commit f8ba05b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/...om/synopsys/arc/jenkinsci/plugins/dynamic_search/views/SimpleSearchView/itemsTable.groovy b/...om/synopsys/arc/jenkinsci/plugins/dynamic_search/views/SimpleSearchView/itemsTable.groovy
@@ -0,0 +1,24 @@
+package com.synopsys.arc.jenkinsci.plugins.dynamic_search.views;
+
+t=namespace(lib.JenkinsTagLib)
+st=namespace("jelly:stapler")
+
+if (my.items.isEmpty()) {
+    if (app.items.size() != 0) {
+        set("views",my.owner.views);
+        set("currentView",my);
+        include(my.owner.viewsTabBar, "viewTabs");
+    }
+    include(my,"noJob.jelly");
+} else {
+    t.projectView(jobs: my.items, showViewTabs: true, columnExtensions: my.columns, 
+                  indenter: my.indenter, itemGroup: my.owner.itemGroup) {
+        set("views",my.owner.views);
+        set("currentView",my);
+        if (my.owner.class == hudson.model.MyViewsProperty.class) {
+            include(my.owner?.myViewsTabBar, "myViewTabs");
+        } else {
+            include(my.owner.viewsTabBar,"viewTabs");
+        }
+    }
+}
diff --git a/...urces/com/synopsys/arc/jenkinsci/plugins/dynamic_search/views/SimpleSearchView/main.jelly b/...urces/com/synopsys/arc/jenkinsci/plugins/dynamic_search/views/SimpleSearchView/main.jelly
@@ -43,7 +43,7 @@
     <br/> 
 
     <!-- Display the job list -->
-    <st:include page="main.jelly" class="hudson.model.ListView"/>
+    <st:include page="itemsTable.jelly"/>
 
     <!--HACK: Clean cache after the request completion--> 
     <j:set var="sessionId" value="${it.cleanCache()}"/>