Skip to content
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.

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

[JENKINS-72189] fix drag&drop handle for existing repeatables #8613

Merged
merged 2 commits into from
Oct 30, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions core/src/main/resources/lib/form/repeatable.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,7 @@ THE SOFTWARE.
<!-- The first DIV is the master copy. -->
<div class="repeated-chunk to-be-removed" name="${name}">
<div class="repeated-chunk__header">
<j:if test="${!empty(header)}"><div class="${readOnlyMode ? '' : 'dd-handle'}"/></j:if>
${header}
<j:if test="${!empty(header)}"><div class="${readOnlyMode ? '' : 'dd-handle'}"/>${header}</j:if>
</div>
<j:scope>
<j:set var="${var}" value="${null}"/>
Expand All @@ -151,7 +150,9 @@ THE SOFTWARE.
<j:forEach var="loop" varStatus="loopStatus" items="${items}">
<div class="repeated-chunk" name="${name}">
<j:set var="${var}" value="${loop}" />
<j:if test="${!empty(header)}"><div class="${readOnlyMode ? '' : 'dd-handle'}">${header}</div></j:if>
<div class="repeated-chunk__header">
<j:if test="${!empty(header)}"><div class="${readOnlyMode ? '' : 'dd-handle'}"/>${header}</j:if>
</div>
<d:invokeBody />
</div>
</j:forEach>
Expand All @@ -161,7 +162,9 @@ THE SOFTWARE.
<j:forEach begin="${h.size2(items)}" end="${minimum-1}" var="i">
<j:set var="${var}" value="${null}" />
<div class="repeated-chunk" name="${name}">
<j:if test="${!empty(header)}"><div class="${readOnlyMode ? '' : 'dd-handle'}">${header}</div></j:if>
<div class="repeated-chunk__header">
<j:if test="${!empty(header)}"><div class="${readOnlyMode ? '' : 'dd-handle'}"/>${header}</j:if>
</div>
<d:invokeBody />
</div>
</j:forEach>
Expand Down