Skip to content

Migrate to non-deprecated method #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 2 commits into from
Mar 3, 2025
Merged

Migrate to non-deprecated method #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3039518
Migrate to non-deprecated method
labkey-adam Mar 1, 2025
fb9b6ff
Rename EVERYTHING -> EVERYTHING_UNSAFE
labkey-adam Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ms2extensions/src/org/labkey/ms2extensions/MS2ExtensionsExperimentRunType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<ViewContext> v = new JspView<>("/org/labkey/ms2extensions/runGridFilters.jsp");
v.addClientDependencies(Collections.singleton(ClientDependency.fromPath("/MS2/inlineViewDesigner.js")));
Expand Down
4 changes: 1 addition & 3 deletions viscstudies/src/org/labkey/viscstudies/ProjectStudiesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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())
{
Expand Down