Skip to content

Fixed agent deletion URL when accessed from subpages #26009

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

Closed
prathamalwayscomeslast wants to merge 7 commits into from
Closed

Fixed agent deletion URL when accessed from subpages #26009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ac2aa1
Fixed agent deletion URL when accessed from subpages
prathamalwayscomeslast Dec 29, 2025
14aa9d0
Merge branch 'master' into issue-26003
prathamalwayscomeslast Dec 29, 2025
09fec53
normalized urlPrefix to avoid double slashes in l:delete tags
prathamalwayscomeslast Dec 29, 2025
eedb91b
Merge branch 'master' into issue-26003
prathamalwayscomeslast Dec 30, 2025
ab50dab
Merge branch 'master' into issue-26003
prathamalwayscomeslast Jan 1, 2026
6d56320
Merge branch 'master' into issue-26003
prathamalwayscomeslast Jan 6, 2026
146a5d7
Merge branch 'master' into issue-26003
prathamalwayscomeslast Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions core/src/main/resources/hudson/model/Computer/sidepanel.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@ THE SOFTWARE.
<l:header />
<l:side-panel>
<l:tasks>
<l:task contextMenu="false" href="${rootURL}/${it.url}" icon="${it.iconClassName}" title="${%Status}"/>
<l:delete permission="${it.DELETE}" title="${%Delete Agent}" message="${%delete.confirm(it.name)}"/>
<l:task href="${rootURL}/${it.url}configure" icon="symbol-settings" permission="${it.EXTENDED_READ}"
<j:set var="url" value="${rootURL}/${it.url}"/>
<l:task contextMenu="false" href="${url}" icon="${it.iconClassName}" title="${%Status}"/>
<l:delete permission="${it.DELETE}" title="${%Delete Agent}" message="${%delete.confirm(it.name)}" urlPrefix="${url}"/>
<l:task href="${url}configure" icon="symbol-settings" permission="${it.EXTENDED_READ}"
title="${it.hasPermission(it.CONFIGURE) ? '%Configure' : '%View Configuration'}"/>
<l:task href="${rootURL}/${it.url}builds" icon="symbol-build-history" title="${%Build History}"/>
<l:task href="${rootURL}/${it.url}load-statistics" icon="symbol-analytics" title="${%Load Statistics}"/>
<l:task href="${url}builds" icon="symbol-build-history" title="${%Build History}"/>
<l:task href="${url}load-statistics" icon="symbol-analytics" title="${%Load Statistics}"/>
<j:if test="${it.channel!=null}">
<l:task href="${rootURL}/${it.url}script" icon="symbol-terminal" permission="${app.ADMINISTER}" title="${%Script Console}"/>
<l:task href="${url}script" icon="symbol-terminal" permission="${app.ADMINISTER}" title="${%Script Console}"/>
</j:if>
<st:include page="sidepanel2.jelly" optional="true" /><!-- hook for derived class to add more items -->
<t:actions />
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/resources/lib/layout/delete.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ THE SOFTWARE.

<j:set var="url" value="doDelete" />
<j:if test="${attrs.urlPrefix != null}">
<j:set var="url" value="${urlPrefix}/doDelete" />
<j:set var="basePrefix" value="${urlPrefix.endsWith('/') ? urlPrefix.substring(0, urlPrefix.length() - 1) : urlPrefix}" />
<j:set var="url" value="${basePrefix}/doDelete" />
</j:if>


Expand Down
Loading