Merge 25.7 to 25.8

labkey-teamcity · labkey-teamcity · commit 4305fde6d6c6 · 2025-08-12T10:43:59.000Z
diff --git a/src/org/labkey/targetedms/query/CrossLinkedPeptideDisplayColumn.java b/src/org/labkey/targetedms/query/CrossLinkedPeptideDisplayColumn.java
@@ -191,7 +191,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
             }
             if (label.endsWith("_hcstar"))
             {
-                result = "*";
+                result = "H*";
             }
             if (label.endsWith("_lc"))
             {

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)`
`191`	`191`	`}`
`192`	`192`	`if (label.endsWith("_hcstar"))`
`193`	`193`	`{`
`194`		`- result = "*";`
	`194`	`+ result = "H*";`
`195`	`195`	`}`
`196`	`196`	`if (label.endsWith("_lc"))`
`197`	`197`	`{`