ContainerFilter is now constructed with a container

previously container passed to getIds(), getSqlFragment() etc

Author: labkey-matthewb

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

@@ -56,8 +56,8 @@ protected SimpleFilter getFilter(Container c, TableInfo ti)
     {
         SimpleFilter filter = new SimpleFilter();
 
-        if (ti.getColumn("container") != null && !(ti.supportsContainerFilter() && ContainerFilter.CURRENT.equals(ti.getContainerFilter())))
-            filter.addClause(ContainerFilter.CURRENT.createFilterClause(ti.getSchema(), FieldKey.fromString("container"), c));
+        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 (_filter != null)
         {

laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java

@@ -973,7 +973,7 @@ private void customzieSamplesTable(AbstractTableInfo ti)
         {
             Container c = ti.getUserSchema().getContainer();
             c = c.isWorkbook() ? c.getParent() : c;
-            SQLFragment containerSql = ContainerFilter.CURRENT.getSQLFragment(LaboratorySchema.getInstance().getSchema(), new SQLFragment(ti.getContainerFieldKey().toString()), c);
+            SQLFragment containerSql = ContainerFilter.current(c).getSQLFragment(LaboratorySchema.getInstance().getSchema(), new SQLFragment(ti.getContainerFieldKey().toString()));
 
             SQLFragment sql = new SQLFragment("(SELECT count(*) as _expr FROM laboratory.samples s WHERE " +
                     " (s.").append(containerSql).append(")" +