Adapt to #23902

Author: timja

core/src/main/resources/jenkins/model/Jenkins/_script.jelly

@@ -27,11 +27,10 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <j:set var="previousIt" value="${it}" />
-  <j:new var="it" className="jenkins.management.ConsoleLink" />
+  <j:new var="managementLink" className="jenkins.management.ConsoleLink" />
 
-  <l:settings-subpage includeBreadcrumb="true" permission="${app.ADMINISTER}" header="${null}" noDefer="true">
-    <j:set var="it" value="${previousIt}" />
+  <l:settings-subpage includeBreadcrumb="true" permission="${app.ADMINISTER}"
+                      header="${null}" noDefer="true" managementLink="${managementLink}">
 
     <t:scriptConsole scripts="${['println(Jenkins.instance.pluginManager.plugins)']}"
                      layout="none" />

core/src/main/resources/lib/layout/settings-subpage.jelly

@@ -26,6 +26,10 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:d="jelly:define" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
   <st:documentation>
     A reusable container for subpages relating under Manage Jenkins.
+    <st:attribute name="managementLink" type="hudson.model.ManagementLink" use="optional">
+      Specifies the object for which page details will be loaded from.
+      Defaults to the "it" object in the current context.
+    </st:attribute>
     <st:attribute name="permission">
       If given, this page is only made available to users who have the specified permission.
       (The permission will be checked against the "it" object.)
@@ -55,19 +59,21 @@ THE SOFTWARE.
   <j:new className="hudson.model.ManageJenkinsAction" var="manageJenkinsAction" />
   <l:userExperimentalFlag var="newManageJenkins" flagClassName="jenkins.model.experimentalflags.NewManageJenkinsUserExperimentalFlag" />
 
-  <l:layout title="${it.displayName} - ${manageJenkinsAction.displayName}"
+  <j:set var="managementLink" value="${attrs.managementLink ?: it}" />
+
+  <l:layout title="${managementLink.displayName} - ${manageJenkinsAction.displayName}"
             permission="${attrs.permission}"
             permissions="${attrs.permissions}"
             type="${newManageJenkins ? 'two-column' : 'one-column'}">
 
     <j:if test="${attrs.includeBreadcrumb}">
       <!-- Hacky - this will be improved in subsequent PRs -->
       <j:choose>
-        <j:when test="${it.class.name eq 'jenkins.management.ConfigureLink'}">
-          <f:breadcrumb-config-outline title="${it.displayName}" />
+        <j:when test="${managementLink.class.name eq 'jenkins.management.ConfigureLink'}">
+          <f:breadcrumb-config-outline title="${managementLink.displayName}" />
         </j:when>
         <j:otherwise>
-          <l:breadcrumb title="${it.displayName}" />
+          <l:breadcrumb title="${managementLink.displayName}" />
         </j:otherwise>
       </j:choose>
     </j:if>
@@ -103,9 +109,9 @@ THE SOFTWARE.
           <div class="app-settings-container">
             <div class="app-settings-container__inner">
               <j:if test="${!attrs.containsKey('header')}">
-                <l:app-bar title="${it.displayName}" />
+                <l:app-bar title="${managementLink.displayName}" />
                 <div class="jenkins-page-description">
-                  ${it.description}
+                  ${managementLink.description}
                 </div>
               </j:if>
 
@@ -140,9 +146,9 @@ THE SOFTWARE.
       <j:otherwise>
         <l:main-panel>
           <j:if test="${!attrs.containsKey('header')}">
-            <l:app-bar title="${it.displayName}" />
+            <l:app-bar title="${managementLink.displayName}" />
             <div class="jenkins-page-description">
-              ${it.description}
+              ${managementLink.description}
             </div>
           </j:if>