Avoid hard-coding container

bbimber · bbimber · commit 214800a0913d · 2025-08-19T12:45:08.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,10 @@ 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)
+
+            if (getContainerFieldKey() != null)
             {
-                filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), FieldKey.fromParts("container")));
+                filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), getContainerFieldKey()));
             }
 
             return Table.delete(getDbTable(), filter);

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,10 @@ 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)`
	`197`	`+`
	`198`	`+ if (getContainerFieldKey() != null)`
`198`	`199`	`{`
`199`		`- filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), FieldKey.fromParts("container")));`
	`200`	`+ filter.addClause(new ContainerFilter.CurrentOrParentAndWorkbooks(container, user).createFilterClause(getSchema(), getContainerFieldKey()));`
`200`	`201`	`}`
`201`	`202`
`202`	`203`	`return Table.delete(getDbTable(), filter);`