Consider container when truncating data in AbstractDataDefinedTable

bbimber · bbimber · commit 8c329ce18c8f · 2025-08-19T12:43:30.000-07:00
diff --git a/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java b/LDK/api-src/org/labkey/api/ldk/table/AbstractDataDefinedTable.java
@@ -194,9 +194,13 @@ protected Map<String, Object> updateRow(User user, Container container, Map<Stri
         protected int truncateRows(User user, Container container)
         {
             SimpleFilter filter = new SimpleFilter(FieldKey.fromString(_filterColumn), _filterValue, CompareType.EQUAL);
+            if (getColumn("container") != null)
+            {
+                filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), FieldKey.fromParts("container")));
+            }
+
             return Table.delete(getDbTable(), filter);
         }
-
     }
 
     protected class ValuesManager

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,13 @@ protected Map<String, Object> updateRow(User user, Container container, Map<Stri`
`194`	`194`	`protected int truncateRows(User user, Container container)`
`195`	`195`	`{`
`196`	`196`	`SimpleFilter filter = new SimpleFilter(FieldKey.fromString(_filterColumn), _filterValue, CompareType.EQUAL);`
	`197`	`+ if (getColumn("container") != null)`
	`198`	`+ {`
	`199`	`+ filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), FieldKey.fromParts("container")));`
	`200`	`+ }`
	`201`	`+`
`197`	`202`	`return Table.delete(getDbTable(), filter);`
`198`	`203`	`}`
`199`		`-`
`200`	`204`	`}`
`201`	`205`
`202`	`206`	`protected class ValuesManager`