Merge 25.3 to 25.7

labkey-teamcity · labkey-teamcity · commit 1b43b98dba6b · 2025-07-08T07:43:28.000Z
diff --git a/snd/src/org/labkey/snd/SNDServiceImpl.java b/snd/src/org/labkey/snd/SNDServiceImpl.java
@@ -474,7 +474,10 @@ private JSONArray lookupValuesToJson(Container c, User u, String schema, String
                             Object displayable = rs.getObject("displayable");
                             jsonObject.put("displayable",displayable);
                         }
-
+                        if(colNames.contains("sortOrder")) {
+                            Object sortOrder = rs.getObject("sortOrder");
+                            jsonObject.put("sortOrder",sortOrder);
+                        }
                         array.put(jsonObject);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,10 @@ private JSONArray lookupValuesToJson(Container c, User u, String schema, String`
`474`	`474`	`Object displayable = rs.getObject("displayable");`
`475`	`475`	`jsonObject.put("displayable",displayable);`
`476`	`476`	`}`
`477`		`-`
	`477`	`+ if(colNames.contains("sortOrder")) {`
	`478`	`+ Object sortOrder = rs.getObject("sortOrder");`
	`479`	`+ jsonObject.put("sortOrder",sortOrder);`
	`480`	`+ }`
`478`	`481`	`array.put(jsonObject);`
`479`	`482`	`}`
`480`	`483`	`}`