From 3039518f991c9eb988f11659dba163ea67fbd4f7 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Sat, 1 Mar 2025 10:42:18 -0800 Subject: [PATCH 1/2] Migrate to non-deprecated method --- .../labkey/ms2extensions/MS2ExtensionsExperimentRunType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ms2extensions/src/org/labkey/ms2extensions/MS2ExtensionsExperimentRunType.java b/ms2extensions/src/org/labkey/ms2extensions/MS2ExtensionsExperimentRunType.java index 54ad4948..fa9f7a3f 100644 --- a/ms2extensions/src/org/labkey/ms2extensions/MS2ExtensionsExperimentRunType.java +++ b/ms2extensions/src/org/labkey/ms2extensions/MS2ExtensionsExperimentRunType.java @@ -20,6 +20,7 @@ import org.labkey.api.exp.ExperimentRunType; import org.labkey.api.exp.api.ExpProtocol; import org.labkey.api.exp.api.ExperimentService; +import org.labkey.api.security.User; import org.labkey.api.view.DataView; import org.labkey.api.view.JspView; import org.labkey.api.view.ViewContext; @@ -59,7 +60,7 @@ public void populateButtonBar(ViewContext context, ButtonBar bar, DataView view, } @Override - public void renderHeader(HttpServletRequest request, HttpServletResponse response) throws Exception + public void renderHeader(HttpServletRequest request, HttpServletResponse response, User user) throws Exception { JspView v = new JspView<>("/org/labkey/ms2extensions/runGridFilters.jsp"); v.addClientDependencies(Collections.singleton(ClientDependency.fromPath("/MS2/inlineViewDesigner.js"))); From fb9b6ff2dc3fe60b96df3918d5189d70c86ad09f Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 3 Mar 2025 07:56:13 -0800 Subject: [PATCH 2/2] Rename EVERYTHING -> EVERYTHING_UNSAFE --- .../src/org/labkey/viscstudies/ProjectStudiesTable.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/viscstudies/src/org/labkey/viscstudies/ProjectStudiesTable.java b/viscstudies/src/org/labkey/viscstudies/ProjectStudiesTable.java index 4b38e484..d2338ce1 100644 --- a/viscstudies/src/org/labkey/viscstudies/ProjectStudiesTable.java +++ b/viscstudies/src/org/labkey/viscstudies/ProjectStudiesTable.java @@ -18,8 +18,6 @@ import org.labkey.api.data.ColumnInfo; import org.labkey.api.data.ContainerFilter; import org.labkey.api.data.ContainerFilterable; -import org.labkey.api.data.DisplayColumn; -import org.labkey.api.data.DisplayColumnFactory; import org.labkey.api.data.TableInfo; import org.labkey.api.exp.PropertyColumn; import org.labkey.api.query.DetailsURL; @@ -46,7 +44,7 @@ public ProjectStudiesTable(ViscStudySchema schema, TableInfo studyTable) ContainerFilter containerFilter = ContainerFilter.Type.CurrentAndSubfolders.create(getUserSchema()); ((ContainerFilterable)studyTable).setContainerFilter(containerFilter); // don't need to apply the same container filter twice and the inner table already has the CF applied - applyContainerFilter(ContainerFilter.EVERYTHING); + applyContainerFilter(ContainerFilter.EVERYTHING_UNSAFE); for (ColumnInfo col : getRealTable().getColumns()) {