Skip to content

Remove the confusing second Rebuild button when Rebuilder plugin can do the job (better) #1766

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

Open
jimklimov wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove the confusing second Rebuild button when Rebuilder plugin can do the job (better) #1766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 22 additions & 0 deletions plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,13 +141,35 @@ public String getUrlName() {
return null;
}

/** Offer a fallback Rebuild link if Replay is not permitted? */
/* accessible to Jelly */ public boolean isRebuildEnabled() {
if (!run.hasPermission(Item.BUILD)) {
return false;
}
if (!run.getParent().isBuildable()) {
return false;
}
if (Jenkins.get().getPlugin("rebuild") != null) {
// Go via reflection to avoid a pom.xml (and subsequent
// Jenkins controller) dependency on the "competing" plugin:
try {
Class<?> abstractRebuildAction = Jenkins.get()
.getPluginManager()
.uberClassLoader
.loadClass("com.sonyericsson.rebuild.AbstractRebuildAction");
if ((Boolean)
abstractRebuildAction.getMethod("isRebuildAvailable").invoke(null)) {
// THAT plugin will handle the Rebuild link better
// (parameterized if need be), so we here should
// show nothing at all
return false;
}
} catch (ClassNotFoundException e) {
// ignore
} catch (Exception e) {
LOGGER.log(Level.WARNING, "failed to check for rebuild-plugin", e);
}
}

return true;
}
Expand Down
20 changes: 11 additions & 9 deletions plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/replay/ReplayAction/index.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,17 @@
</f:form>
</j:when>
<j:otherwise>
<h1>${%Rebuild(it.owner.displayName)}</h1>
<p>
<j:out value="${%blurb.rebuild}"/>
</p>
<f:form action="rebuild" method="POST" name="rebuild">
<f:bottomButtonBar>
<f:submit value="${%Run}"/>
</f:bottomButtonBar>
</f:form>
<j:when test="${it.rebuildEnabled}">
<h1>${%Rebuild(it.owner.displayName)}</h1>
<p>
<j:out value="${%blurb.rebuild}"/>
</p>
<f:form action="rebuild" method="POST" name="rebuild">
<f:bottomButtonBar>
<f:submit value="${%Run}"/>
</f:bottomButtonBar>
</f:form>
</j:when>
</j:otherwise>
</j:choose>
</j:if>
Expand Down
Loading