diff --git a/api/src/org/labkey/api/inventory/InventoryService.java b/api/src/org/labkey/api/inventory/InventoryService.java index 7690e2c8993..4ce70bafb33 100644 --- a/api/src/org/labkey/api/inventory/InventoryService.java +++ b/api/src/org/labkey/api/inventory/InventoryService.java @@ -52,6 +52,7 @@ enum InventoryStatusColumn StorageColSort, StorageComment, StorageLocation, + StorageTerminalLocation, StorageRow, StorageRowSort, StoragePositionNumber, diff --git a/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java b/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java index 33b412786e1..f403d9e31d0 100644 --- a/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java +++ b/experiment/src/org/labkey/experiment/api/ExpMaterialTableImpl.java @@ -875,7 +875,11 @@ protected void populateColumns() addColumn(RawAliquotUnit).getRenderer().addQueryFieldKeys(new HashSet<>(Set.of(AliquotUnit.fieldKey()))); if (InventoryService.get() != null && (st == null || !st.isMedia())) - defaultCols.addAll(InventoryService.get().addInventoryStatusColumns(st == null ? null : st.getMetricUnit(), this, getContainer(), _userSchema.getUser())); + { + List inventoryCols = InventoryService.get().addInventoryStatusColumns(st == null ? null : st.getMetricUnit(), this, getContainer(), _userSchema.getUser()); + // GH Issue 1035: Don't include StorageTerminalLocation in the default view + defaultCols.addAll(inventoryCols.stream().filter(fk -> !fk.equals(InventoryService.InventoryStatusColumn.StorageTerminalLocation.fieldKey())).toList()); + } SQLFragment sql; UserSchema plateUserSchema;