Skip to content

Commit

Permalink
[JENKINS-40364] Fix validation URL of configs combobox
Browse files Browse the repository at this point in the history
  • Loading branch information
nfalco79 committed Jan 24, 2017
1 parent 1b4d274 commit 8d073dd
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 14 deletions.
Expand Up @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?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">
<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:cf="/lib/nodejs">

<f:entry title="${%nodeJSInstallationName.title}" description="${%nodeJSInstallationName.description}">
<select class="setting-input" name="_.nodeJSInstallationName">
Expand All @@ -33,12 +33,7 @@ THE SOFTWARE.
</f:entry>

<f:entry title="${%configId.title}">
<select class="setting-input validated select" name="_.configId" checkdependson="configId" checkurl="/jenkins/job/test/descriptorByName/jenkins.plugins.nodejs.NodeJSBuildWrapper/checkConfigId">
<f:option value="">${%configId.emptyValue}</f:option>
<j:forEach var="config" items="${descriptor.configs}">
<f:option selected="${instance.configId == config.id}" value="${config.id}">${config.name}</f:option>
</j:forEach>
</select>
<cf:select field="configId" configs="${descriptor.configs}" allowsEmpty="true" emptyValue="" emptyLabel="${%configId.emptyValue}" />
</f:entry>

</j:jelly>
Expand Up @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->
<?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">
<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:cf="/lib/nodejs">
<f:entry title="${%nodeJSInstallationName.title}" description="${%nodeJSInstallationName.description}">
<select class="setting-input" name="_.nodeJSInstallationName">
<f:option value="">${%nodeJSInstallationName.emptyValue}</f:option>
Expand All @@ -38,11 +38,6 @@ THE SOFTWARE.


<f:entry title="${%configId.title}">
<select class="setting-input validated select" name="_.configId" checkdependson="configId" checkurl="/jenkins/job/test/descriptorByName/jenkins.plugins.nodejs.NodeJSBuildWrapper/checkConfigId">
<f:option value="">${%configId.emptyValue}</f:option>
<j:forEach var="config" items="${descriptor.configs}">
<f:option selected="${instance.configId == config.id}" value="${config.id}">${config.name}</f:option>
</j:forEach>
</select>
<cf:select field="configId" configs="${descriptor.configs}" allowsEmpty="true" emptyValue="" emptyLabel="${%configId.emptyValue}" />
</f:entry>
</j:jelly>
66 changes: 66 additions & 0 deletions src/main/resources/lib/nodejs/select.jelly
@@ -0,0 +1,66 @@
<!--
The MIT License
Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, Bruce Chapman, Alan Harder, CloudBees, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-->

<!-- INTERNAL USE ONLY untill config-file-provider will come out with own -->

<?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">
<st:documentation>
Glorified &lt;select> control that supports the data binding and AJAX updates.
Your descriptor should have the 'doFillXyzItems' method, which returns a ListBoxModel
representation of the items in your drop-down list box, and your instance field
should hold the current value.
<st:attribute name="clazz">
Additional CSS classes that the control gets.
</st:attribute>
<st:attribute name="field">
Used for databinding.
</st:attribute>
<st:attribute name="configs" use="required" type="java.util.Collection">
existing configs to be displayed. Something iterable, such as array or collection.
</st:attribute>
<st:attribute name="default" />
<st:attribute name="allowsEmpty" />
<st:attribute name="emptyValue" />
<st:attribute name="emptyLabel" />
</st:documentation>

<f:prepareDatabinding />
<st:adjunct includes="lib.form.select.select" />

<j:set var="value" value="${attrs.value ?: instance[attrs.field] ?: attrs.default}" />
<m:select xmlns:m="jelly:hudson.util.jelly.MorphTagLibrary"
class="setting-input ${attrs.checkUrl!=null?'validated':''} select ${attrs.clazz}"
name="${attrs.name ?: '_.'+attrs.field}"
value="${value}"
ATTRIBUTES="${attrs}"
EXCEPT="field clazz">
<j:if test="${allowsEmpty}">
<option value="${emptyValue}">${emptyLabel}</option>
</j:if>
<j:forEach var="config" items="${configs}">
<option selected="${value == config.id}" value="${config.id}">${config.name}</option>
</j:forEach>
</m:select>
</j:jelly>
Empty file.

0 comments on commit 8d073dd

Please sign in to comment.