diff --git a/api/src/org/labkey/api/data/JsonWriter.java b/api/src/org/labkey/api/data/JsonWriter.java index d23b7818844..fb203055ed5 100644 --- a/api/src/org/labkey/api/data/JsonWriter.java +++ b/api/src/org/labkey/api/data/JsonWriter.java @@ -300,7 +300,19 @@ else if (cinfo.getFacetingBehaviorType() != null) } if (dc instanceof IMultiValuedDisplayColumn) + { props.put("multiValue", true); + if (dc instanceof ILineageDisplayColumn lineageCol) + { + // Issue 52878: Attachment thumbnails from Source Types do not render + ColumnInfo innerCol = lineageCol.getInnerBoundColumn(); + if (innerCol != null) + { + props.put("align", innerCol.getTextAlign()); + props.put("inputType", innerCol.getInputType()); + } + } + } if (null != cinfo) { diff --git a/experiment/src/org/labkey/experiment/api/AncestorLookupDisplayColumn.java b/experiment/src/org/labkey/experiment/api/AncestorLookupDisplayColumn.java index 4b198834839..90f5f30cd31 100644 --- a/experiment/src/org/labkey/experiment/api/AncestorLookupDisplayColumn.java +++ b/experiment/src/org/labkey/experiment/api/AncestorLookupDisplayColumn.java @@ -9,6 +9,7 @@ import org.labkey.api.data.RenderContext; import org.labkey.api.query.FieldKey; import org.labkey.api.util.HtmlString; +import org.labkey.api.writer.HtmlWriter; import java.util.Set; @@ -120,6 +121,20 @@ public String renderURL(RenderContext ctx) return super.renderURL(ctx); } + @Override + public void renderGridCellContents(RenderContext ctx, HtmlWriter out) + { + Integer lookupKey = getLookupId(ctx); + + if (_dc != null && lookupKey != null && lookupKey > 0) + { + _dc.renderGridCellContents(ctx, out); + return; + } + + super.renderGridCellContents(ctx, out); + } + @Override public void addQueryFieldKeys(Set keys) {