Skip to content

Fix MVFK select input #7188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 8, 2025
Merged

Fix MVFK select input #7188

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d21b144
Why do we support multiple search string?
labkey-matthewb Nov 7, 2025
fe60dab
fix for renderSelectFormInputFromFk()
labkey-matthewb Nov 7, 2025
9c2a553
remove unrelated change
labkey-matthewb Nov 8, 2025
6846450
remove unrelated change
labkey-matthewb Nov 8, 2025
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
18 changes: 13 additions & 5 deletions api/src/org/labkey/api/data/DataColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,10 +712,7 @@ else if (_inputType.equalsIgnoreCase("checkbox"))
{
IPropertyValidator textChoiceValidator = PropertyService.get().getValidatorForColumn(_boundColumn, PropertyValidatorType.TextChoice);
if (textChoiceValidator != null)
{
List<String> strVals = StringUtils.isEmpty(strVal) ? List.of() : List.of(strVal);
renderTextChoiceFormInput(out, formFieldName, value, strVals, disabledInput, textChoiceValidator);
}
renderTextChoiceFormInput(out, formFieldName, value, toListForRender(strVal), disabledInput, textChoiceValidator);
else
renderTextFormInput(out, formFieldName, value, strVal, disabledInput);
}
Expand Down Expand Up @@ -812,10 +809,21 @@ protected void renderSelectFormInputFromFk(RenderContext ctx, HtmlWriter out, St
}
else
{
renderSelectFormInput(out, formFieldName, value, List.of(Objects.toString(value)), disabledInput, entryList);
renderSelectFormInput(out, formFieldName, value, toListForRender(value), disabledInput, entryList);
}
}

List<String> toListForRender(Object value)
{
if (null == value || value instanceof String)
return StringUtils.isEmpty((String) value) ? List.of() : List.of((String)value);
if (value instanceof MultiChoice.Array arr)
return arr;
if (value instanceof List<?> l)
return l.stream().map(o -> Objects.toString(o, null)).toList();
return List.of(Objects.toString(value));
}

protected void renderFileFormInput(HtmlWriter out, String formFieldName, Object value, String strVal, boolean disabledInput)
{
var input = InputBuilder.file()
Expand Down