Pass in user to ContainerFilter

Author: labkey-adam

laboratory/api-src/org/labkey/api/laboratory/QueryCountNavItem.java

@@ -47,17 +47,17 @@ public Long getRowCount(Container c, User u)
         if (ti == null)
             return Long.valueOf(0);
 
-        SimpleFilter filter = getFilter(c, ti);
+        SimpleFilter filter = getFilter(c, u, ti);
         TableSelector ts = new TableSelector(ti, ti.getPkColumns(), filter, null);
         return ts.getRowCount();
     }
 
-    protected SimpleFilter getFilter(Container c, TableInfo ti)
+    protected SimpleFilter getFilter(Container c, User u, TableInfo ti)
     {
         SimpleFilter filter = new SimpleFilter();
 
-        if (ti.getColumn("container") != null && !(ti.supportsContainerFilter() && ContainerFilter.current(c).equals(ti.getContainerFilter())))
-            filter.addClause(ContainerFilter.current(c).createFilterClause(ti.getSchema(), FieldKey.fromString("container")));
+        if (ti.getColumn("container") != null && !(ti.supportsContainerFilter() && ContainerFilter.current(c, u).equals(ti.getContainerFilter())))
+            filter.addClause(ContainerFilter.current(c, u).createFilterClause(ti.getSchema(), FieldKey.fromString("container")));
 
         if (_filter != null)
         {

laboratory/src/org/labkey/laboratory/SamplesCountNavItem.java

@@ -8,6 +8,7 @@
 import org.labkey.api.laboratory.LaboratoryService;
 import org.labkey.api.laboratory.QueryCountNavItem;
 import org.labkey.api.query.FieldKey;
+import org.labkey.api.security.User;
 
 /**
  * User: bimber
@@ -22,9 +23,9 @@ public SamplesCountNavItem(DataProvider provider, String schema, String query, L
     }
 
     @Override
-    protected SimpleFilter getFilter(Container c, TableInfo ti)
+    protected SimpleFilter getFilter(Container c, User u, TableInfo ti)
     {
-        SimpleFilter filter = super.getFilter(c, ti);
+        SimpleFilter filter = super.getFilter(c, u, ti);
         filter.addCondition(FieldKey.fromString("dateremoved"), null, CompareType.ISBLANK);
         return filter;
     }