From 536a03649b9030db019e2cc2282d88dfb5e12eb7 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Fri, 11 Apr 2025 16:27:22 -0700 Subject: [PATCH 1/2] Improve display element builders --- .../genotyping/ConcatenatedHaplotypesDisplayColumn.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/genotyping/src/org/labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java b/genotyping/src/org/labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java index fda95486..795e6cd1 100644 --- a/genotyping/src/org/labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java +++ b/genotyping/src/org/labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java @@ -23,7 +23,7 @@ import org.labkey.api.data.SimpleFilter; import org.labkey.api.data.TableInfo; import org.labkey.api.query.FieldKey; -import org.labkey.api.util.Link; +import org.labkey.api.util.LinkBuilder; import org.labkey.api.view.ActionURL; import org.labkey.api.writer.HtmlWriter; @@ -102,7 +102,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out) } filter.applyToURL(url, "query"); String evaluatedURL = url.getURIString(); - out.write(new Link.LinkBuilder(haplotype).href(evaluatedURL).target("_blank").clearClasses()); + out.write(new LinkBuilder(haplotype).href(evaluatedURL).target("_blank").clearClasses()); } } } From d70ac1f0f8a4c4fc29c2ae04cea9cae2f2eafcdd Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Sat, 12 Apr 2025 08:46:08 -0700 Subject: [PATCH 2/2] Use simpleLink() --- .../labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/genotyping/src/org/labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java b/genotyping/src/org/labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java index 795e6cd1..a9717d42 100644 --- a/genotyping/src/org/labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java +++ b/genotyping/src/org/labkey/genotyping/ConcatenatedHaplotypesDisplayColumn.java @@ -101,8 +101,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out) filter.addCondition(FieldKey.fromParts("Species"), speciesValue); } filter.applyToURL(url, "query"); - String evaluatedURL = url.getURIString(); - out.write(new LinkBuilder(haplotype).href(evaluatedURL).target("_blank").clearClasses()); + out.write(LinkBuilder.simpleLink(haplotype, url).target("_blank")); } } }