Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use tabPane to show agent systeminfo extensions #9006

Merged
merged 2 commits into from Mar 4, 2024
Merged

use tabPane to show agent systeminfo extensions #9006

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0024232
use tabPane to show agents systeminfo extensions
mawinter69 Mar 1, 2024
579ba58
don't include js when not connected
mawinter69 Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions core/src/main/resources/hudson/slaves/SlaveComputer/systemInfo.jelly
View file
Open in desktop
Expand Up @@ -30,26 +30,26 @@ 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">
<l:layout title="${it.displayName} ${%System Information}" permissions="${it.EXTENDED_READ_AND_CONNECT}">
<j:if test="${it.channel != null}">
<l:header>
<script src="${resURL}/jsbundles/section-to-tabs.js" type="text/javascript" defer="true" />
</l:header>
</j:if>
<st:include page="sidepanel.jelly" />
<l:breadcrumb title="${%System Information}" />

<l:main-panel>

<h1>
<span class="icon-lg">
<l:icon src="${it.icon}"/>
</span>${it.caption}
${%System Information}
</h1>
<l:app-bar title="${it.caption} ${%System Information}"/>

<j:choose>
<j:when test="${it.channel != null}">
<h2>${it.oSDescription} agent, version ${it.slaveVersion}</h2>
<h4>${it.oSDescription} agent, version ${it.slaveVersion}</h4>

<j:forEach var="instance" items="${it.systemInfoExtensions}">
<l:hasPermission permission="${instance.requiredPermission}">
<h1>${instance.displayName}</h1>
<st:include page="systemInfo" from="${instance}"/>
<l:tabPane title="${instance.displayName}">
<st:include page="systemInfo" from="${instance}"/>
</l:tabPane>
</l:hasPermission>
</j:forEach>
</j:when>
Expand Down