From ca67801278fab633acbcb07f765a30405107d36c Mon Sep 17 00:00:00 2001 From: XingY Date: Fri, 20 Mar 2026 14:37:46 -0700 Subject: [PATCH 1/3] Fix select inputs --- api/src/org/labkey/api/util/PageFlowUtil.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/org/labkey/api/util/PageFlowUtil.java b/api/src/org/labkey/api/util/PageFlowUtil.java index c1240a601cc..dcd6b803a71 100644 --- a/api/src/org/labkey/api/util/PageFlowUtil.java +++ b/api/src/org/labkey/api/util/PageFlowUtil.java @@ -2669,10 +2669,15 @@ else if (peek(pos, charArray) == '"') // Google Sheets compatible version of joinValuesToString() public static String joinValuesToStringForExport(@NotNull List values) + { + return joinValuesToStringForExport(values, ", "); + } + + public static String joinValuesToStringForExport(@NotNull List values, String delimiter) { return values.stream() .map(value -> null==value ? "" : shouldEscapeForExport(value) ? "\"" + Strings.CS.replace(value,"\"", "\"\"") + "\"": value) - .collect(Collectors.joining(", ")); + .collect(Collectors.joining(delimiter)); } private static boolean shouldEscapeForExport(@NotNull String value) From 659b6c955109482ecf9865c12c8a38919d866e39 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 24 Mar 2026 18:32:10 -0700 Subject: [PATCH 2/3] fix test --- api/src/org/labkey/api/data/MultiChoice.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/org/labkey/api/data/MultiChoice.java b/api/src/org/labkey/api/data/MultiChoice.java index d46d506a5ad..294216a52e1 100644 --- a/api/src/org/labkey/api/data/MultiChoice.java +++ b/api/src/org/labkey/api/data/MultiChoice.java @@ -148,7 +148,12 @@ public String getTsvFormattedValue(RenderContext ctx) @Override public Object getExcelCompatibleValue(RenderContext ctx) { - return getTsvFormattedValue(ctx); + Array values = getArrayValue(ctx); + if (null != values && !values.isEmpty()) + { + return PageFlowUtil.joinValuesToStringForExport(values); + } + return null; } @Override From 0c4eb23d8a0d501b78b65f5277f77c452885d8e7 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 24 Mar 2026 18:35:47 -0700 Subject: [PATCH 3/3] revert --- api/src/org/labkey/api/data/MultiChoice.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/api/src/org/labkey/api/data/MultiChoice.java b/api/src/org/labkey/api/data/MultiChoice.java index 294216a52e1..d46d506a5ad 100644 --- a/api/src/org/labkey/api/data/MultiChoice.java +++ b/api/src/org/labkey/api/data/MultiChoice.java @@ -148,12 +148,7 @@ public String getTsvFormattedValue(RenderContext ctx) @Override public Object getExcelCompatibleValue(RenderContext ctx) { - Array values = getArrayValue(ctx); - if (null != values && !values.isEmpty()) - { - return PageFlowUtil.joinValuesToStringForExport(values); - } - return null; + return getTsvFormattedValue(ctx); } @Override