Skip to content

Commit 75d865a

Browse files
authored
Merge pull request #146 from yaroslavafenkin/JENKINS-74081
[JENKINS-74081] Migrate legacy `checkUrl` in `/ValidatingStringParameterDefinition/index.jelly`
2 parents f7b4e45 + 187ba9f commit 75d865a

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

src/main/java/hudson/plugins/validating_string_parameter/ValidatingStringParameterDefinition.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@ public FormValidation doCheckRegex(@QueryParameter final String value) {
116116
* Called to validate the passed user entered value against the configured regular expression.
117117
*/
118118
@POST
119-
public FormValidation doValidate(@QueryParameter("regex") String regex,
120-
@QueryParameter("failedValidationMessage") final String failedValidationMessage,
121-
@QueryParameter("value") final String value) {
119+
public FormValidation doValidate(@QueryParameter String regex, @QueryParameter final String failedValidationMessage,
120+
@QueryParameter final String value) {
122121
try {
123122
if (Pattern.matches(regex, value)) {
124123
return FormValidation.ok();

src/main/resources/hudson/plugins/validating_string_parameter/ValidatingStringParameterDefinition/index.jelly

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,15 @@ THE SOFTWARE.
2525
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
2626

2727
<j:set var="escapeEntryTitleAndDescription" value="false"/>
28-
29-
<f:entry title="${h.xmlEscape(it.name)}" description="${it.formattedDescription}">
30-
<div name="parameter" description="${it.formattedDescription}">
31-
<input type="hidden" name="name" value="${it.name}" />
32-
<f:textbox name="value" value="${it.defaultValue}"
33-
checkUrl="'${rootURL}/descriptorByName/hudson.plugins.validating_string_parameter.ValidatingStringParameterDefinition/validate?regex='+encodeURIComponent('${h.jsStringEscape(it.regex)}')+'&amp;failedValidationMessage='+encodeURIComponent('${h.jsStringEscape(it.failedValidationMessage)}')+'&amp;value='+encodeURIComponent(this.value)"/>
34-
</div>
28+
29+
<f:invisibleEntry>
30+
<f:textbox field="regex" value="${it.regex}"/>
31+
</f:invisibleEntry>
32+
<f:invisibleEntry>
33+
<f:textbox field="failedValidationMessage" value="${it.failedValidationMessage}"/>
34+
</f:invisibleEntry>
35+
<f:entry title="${h.xmlEscape(it.name)}" description="${it.formattedDescription}" field="defaultValue">
36+
<f:textbox value="${it.defaultValue}" checkUrl="${it.descriptor.descriptorFullUrl}/validate"
37+
checkDependsOn="regex failedValidationMessage"/>
3538
</f:entry>
3639
</j:jelly>

0 commit comments

Comments
 (0)