Skip to content

Commit 1c3de0b

Browse files
Fix includes for badges and summary in experimental views (#351)
* Fix include pages for badges and summaries * Only create detail and tab if there is something to display
1 parent 987d0fe commit 1c3de0b

4 files changed

Lines changed: 14 additions & 5 deletions

File tree

src/main/java/com/jenkinsci/plugins/badge/detail/BadgeDetail.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ public Class<Run> type() {
7272
@NonNull
7373
@Override
7474
public List<? extends Detail> createFor(@NonNull Run target) {
75-
return List.of(new BadgeDetail(target));
75+
BadgeDetail detail = new BadgeDetail(target);
76+
if (detail.getActions().isEmpty()) {
77+
return List.of();
78+
} else {
79+
return List.of(detail);
80+
}
7681
}
7782
}
7883
}

src/main/java/com/jenkinsci/plugins/badge/tab/SummaryTab.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import hudson.Extension;
2929
import hudson.model.Run;
3030
import java.util.Collection;
31-
import java.util.Collections;
3231
import java.util.List;
3332
import jenkins.model.Tab;
3433
import jenkins.model.TransientActionFactory;
@@ -77,7 +76,12 @@ public Class<Run> type() {
7776
@NonNull
7877
@Override
7978
public Collection<SummaryTab> createFor(@NonNull Run target) {
80-
return Collections.singleton(new SummaryTab(target));
79+
SummaryTab tab = new SummaryTab(target);
80+
if (tab.getActions().isEmpty()) {
81+
return List.of();
82+
} else {
83+
return List.of(tab);
84+
}
8185
}
8286
}
8387
}

src/main/resources/com/jenkinsci/plugins/badge/detail/BadgeDetail/detail.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ THE SOFTWARE.
2626
<?jelly escape-by-default='true'?>
2727
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
2828
<j:forEach var="action" items="${it.actions}">
29-
<st:include page="../../action/BadgeAction/badge.jelly" it="${action}"/>
29+
<st:include page="/com/jenkinsci/plugins/badge/action/BadgeAction/badge.jelly" it="${action}" />
3030
</j:forEach>
3131
</j:jelly>

src/main/resources/com/jenkinsci/plugins/badge/tab/SummaryTab/widget.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ THE SOFTWARE.
2929
<div>
3030
<table>
3131
<j:forEach var="action" items="${it.actions}">
32-
<st:include page="../../action/BadgeSummaryAction/summary-entry.jelly" it="${action}" optional="true"/>
32+
<st:include page="/com/jenkinsci/plugins/badge/action/BadgeSummaryAction/summary-entry.jelly" it="${action}" />
3333
</j:forEach>
3434
</table>
3535
</div>

0 commit comments

Comments
 (0)