Skip to content

Commit

Permalink
Remove unnecessary jelly conditional code (jenkinsci#94)
Browse files Browse the repository at this point in the history
The configuration form modernization happened in Jenkins 2.277.1.
This plugin requires at least Jenkins 2.361.4.  The divBasedFormLayout
conditional will always be true.  Inline the <div> tags rather than
using a conditional.
  • Loading branch information
MarkEWaite authored Dec 4, 2023
1 parent a8ff00b commit a06b4ee
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
16 changes: 0 additions & 16 deletions src/main/resources/lib/conditionalbuildstep/blockWrapper.jelly

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?jelly escape-by-default='true'?>
<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:cb="/lib/conditionalbuildstep">
<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">

<f:entry>
<f:dropdownDescriptorSelector title="${%condition}" field="runCondition" descriptors="${descriptor.runConditions}" />
Expand All @@ -13,14 +13,14 @@
<f:block>
<div style="padding-left: 2em">
<fieldset style="margin-bottom:1em">
<cb:blockWrapper>
<div>
<f:section title="${%stepssection}">
<f:nested>
<f:hetero-list name="conditionalbuilders" hasHeader="true" descriptors="${descriptor.getBuilderDescriptors(it)}" items="${instance.conditionalbuilders}"
addCaption="${%Add step to condition}" />
</f:nested>
</f:section>
</cb:blockWrapper>
</div>
</fieldset>
</div>
</f:block>
Expand Down

0 comments on commit a06b4ee

Please sign in to comment.