Skip to content

Commit

Permalink
Fix symbol generation for steps
Browse files Browse the repository at this point in the history
  • Loading branch information
bitwiseman committed Feb 16, 2021
1 parent eabdba1 commit e6519b4
Showing 1 changed file with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ THE SOFTWARE.
<!-- Similar to f:dropdownDescriptorSelector, but adds fallback content to block, and JENKINS-25130 adds per-selection help: -->
<j:set var="item" value="${it.getItem(request)}"/>
<d:taglib uri="local">

<d:tag name="listSteps">
<j:forEach var="quasiDescriptor" items="${quasiDescriptors}">
<j:set var="descriptor" value="${quasiDescriptor.real}"/>
<f:dropdownListBlock title="${quasiDescriptor.symbol}: ${descriptor.displayName}" staplerClass="${descriptor.clazz.name}" lazy="descriptor,item">
<j:set var="symbol" value="${quasiDescriptor.symbol}"/>
<f:dropdownListBlock title="${symbol}: ${descriptor.displayName}" staplerClass="${descriptor.clazz.name}" lazy="descriptor,item,symbol">
<l:ajax>
<j:set var="it" value="${item}"/>
<j:set var="instance" value="${null}"/>
<j:set var="help" value="${descriptor.helpFile}"/>
<f:entry title="STEP: &lt;code&gt;${quasiDescriptor.symbol}&lt;code&gt;" help="${help}" />
<f:entry title="&lt;strong&gt;&lt;code&gt;${symbol}&lt;code&gt;&lt;/strong&gt;" help="${help}" />
<st:include from="${descriptor}" page="${descriptor.configPage}" optional="true">
<f:block>
${%This step has not yet defined any visual configuration.}
Expand All @@ -62,13 +62,11 @@ THE SOFTWARE.
</j:forEach>
</d:tag>
</d:taglib>

<f:dropdownList name="prototype" title="${%Sample Step}">
<local:listSteps quasiDescriptors="${it.getQuasiDescriptors(false)}"/>
<f:dropdownListBlock title="${%— Advanced/Deprecated —}"/>
<local:listSteps quasiDescriptors="${it.getQuasiDescriptors(true)}"/>
</f:dropdownList>

<j:set var="id" value="${h.generateId()}"/>
<f:block>
<input type="button" value="${%Generate Pipeline Script}" onclick="handlePrototype_${id}(); return false" class="submit-button primary"/>
Expand Down

0 comments on commit e6519b4

Please sign in to comment.