Skip to content

Commit

Permalink
[JENKINS-64639] Removed the table tag inside the entity for new Jenki…
Browse files Browse the repository at this point in the history
…ns versions
  • Loading branch information
ironcerocloudbees committed Feb 18, 2021
1 parent e8b1c00 commit 96f6b08
Showing 1 changed file with 21 additions and 5 deletions.
26 changes: 21 additions & 5 deletions src/main/resources/join/JoinTrigger/config.jelly
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
<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">
<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" xmlns:local="local">
<d:taglib uri="local">
<d:tag name="blockWrapperTable">
<j:choose>
<j:when test="${divBasedFormLayout}">
<div>
<d:invokeBody/>
</div>
</j:when>
<j:otherwise>
<table>
<d:invokeBody/>
</table>
</j:otherwise>
</j:choose>
</d:tag>
</d:taglib>
<j:if test="${descriptor.showResultThresholdOption(targetType)}">
<f:entry title="" help="/plugin/join/help/resultThreshold.html" field="buildTrigger.resultThreshold">
<select class="setting-input" name="buildTrigger.resultThreshold">
Expand All @@ -17,17 +33,17 @@

<j:if test="${descriptor.getApplicableDescriptors().size() > 0}">
<f:nested>
<table>
<local:blockWrapperTable>
<f:optionalBlock name="join.postbuildactions" title="Run post-build actions at join"
checked="${instance.usePostBuildActions()}" help="/plugin/join/help/postbuild.html">
<f:entry>
<table>
<local:blockWrapperTable>
<j:set var="descriptors" value="${null}"/>
<f:descriptorList title="Post-Join Actions" descriptors="${descriptor.getApplicableDescriptors()}" field="joinPublishers"/>
</table>
</local:blockWrapperTable>
</f:entry>
</f:optionalBlock>
</table>
</local:blockWrapperTable>
</f:nested>
</j:if>
</j:jelly>

1 comment on commit 96f6b08

@roebi
Copy link

@roebi roebi commented on 96f6b08 Jun 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wolfs @mdonohue
From https://issues.jenkins.io/browse/JENKINS-64639 Join plugin has tables to div regression
Do you know who could release this plugin - with the tab-2-div change - as a new version?

With kind regards @roebi

Please sign in to comment.