-
Notifications
You must be signed in to change notification settings - Fork 372
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JENKINS-43507] Fix the <scm:traits> taglib
- Loading branch information
Showing
4 changed files
with
31 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 22 additions & 22 deletions
44
...main/resources/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator/config.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,27 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<?jelly escape-by-default='true'?> | ||
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:c="/lib/credentials"> | ||
<j:choose> | ||
<j:when test="${descriptor.apiUriSelectable}"> | ||
<f:entry title="${%API endpoint}" field="apiUri"> | ||
<f:select/> | ||
</f:entry> | ||
</j:when> | ||
<j:otherwise> | ||
<f:invisibleEntry> | ||
<f:select field="apiUri"/> | ||
</f:invisibleEntry> | ||
</j:otherwise> | ||
</j:choose> | ||
<f:entry title="${%Credentials}" field="scanCredentialsId"> | ||
<c:select/> | ||
</f:entry> | ||
<f:entry title="${%Owner}" field="repoOwner"> | ||
<f:textbox/> | ||
</f:entry> | ||
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:c="/lib/credentials" xmlns:scm="/jenkins/scm/api/form"> | ||
<j:choose> | ||
<j:when test="${descriptor.apiUriSelectable}"> | ||
<f:entry title="${%API endpoint}" field="apiUri"> | ||
<f:select/> | ||
</f:entry> | ||
</j:when> | ||
<j:otherwise> | ||
<f:invisibleEntry> | ||
<f:select field="apiUri"/> | ||
</f:invisibleEntry> | ||
</j:otherwise> | ||
</j:choose> | ||
<f:entry title="${%Credentials}" field="scanCredentialsId"> | ||
<c:select/> | ||
</f:entry> | ||
<f:entry title="${%Owner}" field="repoOwner"> | ||
<f:textbox/> | ||
</f:entry> | ||
<f:entry title="${%Behaviours}"> | ||
<f:entry title="${%Behaviours}"> | ||
<f:hetero-list name="traits" items="${instance == null ? descriptor.defaultTraits : instance.traits}" | ||
descriptors="${descriptor[attrs.field+'Descriptors'] ?: descriptor.getPropertyType(instance,'traits').getApplicableItemDescriptors()}" | ||
hasHeader="true" honorOrder="true" oneEach="true"/> | ||
<scm:traits field="traits"/> | ||
</f:entry> | ||
</f:entry> | ||
</j:jelly> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters