Merge branch 'master' into JENKINS-73930

MarkEWaite · Dec 9, 2024 · 5aaf0e1 · 5aaf0e1
2 parents fcc2359 + 6edc0fc
commit 5aaf0e1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/sidepanel.jelly b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/sidepanel.jelly
@@ -23,8 +23,11 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
-    <j:if test="${view == null}"> <!-- true when rendering from ModelObjectWithContextMenu.ContextMenu.from -->
-        <j:set var="view" value="${it.primaryView}"/>
+    <j:set var="primaryView" value="${it.primaryView}"/>
+    <j:if test="${primaryView != null}">
+        <j:if test="${view == null}"> <!-- true when rendering from ModelObjectWithContextMenu.ContextMenu.from -->
+            <j:set var="view" value="${primaryView}"/>
+        </j:if>
+        <st:include it="${primaryView}" page="sidepanel.jelly"/>
     </j:if>
-    <st:include it="${it.primaryView}" page="sidepanel.jelly"/>
 </j:jelly>