Skip to content

Commit de35224

Browse files
authored
JENKINS-70169 Restore link to last breadcrumb (jenkinsci#7539)
1 parent e7b46e9 commit de35224

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

core/src/main/resources/lib/layout/breadcrumb.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ THE SOFTWARE.
4343
</st:documentation>
4444

4545
<j:if test="${mode=='breadcrumbs'}">
46-
<j:set var="hasLink" value="${!(attrs.href == null or h.hyperlinkMatchesCurrentPage(attrs.href))}" />
46+
<j:set var="hasLink" value="${attrs.href != null}" />
4747
<li id="${attrs.id}" class="jenkins-breadcrumbs__list-item" aria-current="${hasLink ? null : 'page'}">
4848
<j:choose>
4949
<j:when test="${!hasLink}">

core/src/main/resources/lib/layout/breadcrumbBar.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ THE SOFTWARE.
4747
<j:if test="${h.isModel(anc.object) and anc.prev.url!=anc.url}">
4848
<j:set var="mode" value="breadcrumbs" />
4949
<l:breadcrumb title="${anc.object == app ? '%Dashboard' : anc.object.displayName}"
50-
href="${contents.length() == 0 and (index == request.ancestors.size() - 1) ? null : anc.url + '/'}"
50+
href="${anc.url}/"
5151
hasMenu="${h.isModelWithContextMenu(anc.object)}" />
5252
<j:choose>
5353
<j:when test="${h.isModelWithChildren(anc.object)}">

0 commit comments

Comments
 (0)