Skip to content
Open
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
11 changes: 8 additions & 3 deletions src/main/java/com/sonyericsson/rebuild/RebuildAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,14 @@ public void doConfigSubmit(StaplerRequest req, StaplerResponse rsp) throws Servl
}
JSONObject jo = (JSONObject)o;
String name = jo.getString("name");
ParameterValue parameterValue = getParameterValue(paramDefProp, name, paramAction, req, jo);
if (parameterValue != null) {
values.add(parameterValue);
try{
ParameterValue parameterValue = getParameterValue(paramDefProp, name, paramAction, req, jo);
if (parameterValue != null) {
values.add(parameterValue);
}
}catch(IllegalArgumentException e){
rsp.sendRedirect(PARAMETERIZED_URL + "?invalidParam=" + name);
return;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ THE SOFTWARE.
<j:set var="parametersProperty"
value="${build.parent.getProperty(parametersDefinitionPropertyClass)}"/>
<f:form method="post" action="configSubmit" name="config" tableClass="parameters">
<j:if test="${request.getParameter('invalidParam') != null}">
<div class="error">
<f:entry title='Invalid value for parameter "${request.getParameter("invalidParam")}"'/>
</div>
</j:if>
<!-- Displaying the form based on current job parameter config with previous build values. -->
<j:set var="escapeEntryTitleAndDescription" value="true"/>
<j:forEach var="parameterDefinition"
Expand Down