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

Remove unused divBasedFormLayout conditionals in jelly files #240

Merged
merged 1 commit into from
Jun 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:p="/lib/promoted_builds">
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
<fieldset style="margin-bottom:1em">
<legend>${%Promotion process}</legend>
<p:blockWrapper>
<div>
<f:entry title="Name" field="name">
<f:textbox />
</f:entry>
Expand Down Expand Up @@ -51,9 +51,9 @@

<f:section title="Criteria">
<f:nested>
<p:blockWrapper>
<div>
<f:descriptorList field="conditions" descriptors="${descriptor.getApplicableConditions(it)}" />
</p:blockWrapper>
</div>
</f:nested>
</f:section>

Expand Down Expand Up @@ -81,6 +81,6 @@
<input type="button" value="${%Delete this promotion process}" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
</div>
</f:entry>
</p:blockWrapper>
</div>
</fieldset>
</j:jelly>
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?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:p="/lib/promoted_builds">
xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:nested>
<f:repeatable var="s" items="${instance.criteria}" noAddButton="true" minimum="1" name="criteria">
<p:blockWrapper>
<div>
<f:entry title="Name">
<f:textbox name="criteria.name" value="${s.name}" />
</f:entry>
<f:block>
Promote a build when all of the following conditions are met:
</f:block>
<f:entry>
<p:blockWrapper>
<div>
<f:descriptorList varName="condition" descriptors="${descriptor.getApplicableConditions(it)}" instances="${s.conditions.toMap()}" />
</p:blockWrapper>
</div>
</f:entry>

<f:entry>
Expand All @@ -22,7 +22,7 @@
<input type="button" value="Delete" class="repeatable-delete show-if-not-only" style="margin-left: 1em;" />
</div>
</f:entry>
</p:blockWrapper>
</div>
</f:repeatable>
</f:nested>
</j:jelly>
23 changes: 0 additions & 23 deletions src/main/resources/lib/promoted_builds/blockWrapper.jelly

This file was deleted.