Skip to content

Commit fe0d91d

Browse files
committed
Fix issue jenkinsci#11 Multiselect uno-choice controls cascade a single value
1 parent d2f2c73 commit fe0d91d

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/main/java/org/biouno/unochoice/CascadeChoiceParameterDefinition.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,14 @@ public int getVisibleItemCount() {
192192
@JavaScriptMethod
193193
public void doUpdate(String parameters) {
194194
getParameters().clear();
195-
String[] params = parameters.split(",");
195+
String[] params = parameters.split("__LESEP__");
196196
for (String param : params) {
197197
String[] nameValue = param.split("=");
198-
String name = nameValue[0];
199-
String value = nameValue[1];
200-
getParameters().put(name, value);
198+
if (nameValue.length == 2) {
199+
String name = nameValue[0];
200+
String value = nameValue[1];
201+
getParameters().put(name, value);
202+
}
201203
}
202204
}
203205

src/main/webapp/js/cascade.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function ReferencedParameter(parameterName, parameterElement) {
2424
value = getParameterValue(referencedParameter.paramName, referencedParameter.paramElement);
2525
params.push(value);
2626
}
27-
paramsString = params.join(',');
27+
paramsString = params.join('__LESEP__');
2828

2929
// call the doUpdate method
3030
cascade.proxy.doUpdate(paramsString);
@@ -195,6 +195,8 @@ getParameterValue = function(name, e) {
195195
if (value == '') // multi selects or radios not selected
196196
value = '';
197197
}
198+
if (value instanceof Array)
199+
value = value.toString()
198200
return name + '=' + value;
199201
}
200202

0 commit comments

Comments
 (0)