Skip to content

Make assay/sample publish confirmation actions POST-only #6691

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-tchad merged 2 commits into from
May 23, 2025
Merged

Make assay/sample publish confirmation actions POST-only #6691

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
284d2f3
Make assay/sample publish confirmation actions POST-only
labkey-tchad May 22, 2025
8ad99c2
Remove unnecessary overrides and imports
labkey-tchad May 23, 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
4 changes: 4 additions & 0 deletions api/src/org/labkey/api/study/publish/AbstractPublishConfirmAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.labkey.api.query.FieldKey;
import org.labkey.api.query.QuerySettings;
import org.labkey.api.query.UserSchema;
import org.labkey.api.security.MethodsAllowed;
import org.labkey.api.security.RequiresPermission;
import org.labkey.api.security.permissions.InsertPermission;
import org.labkey.api.study.Dataset;
Expand Down Expand Up @@ -57,6 +58,9 @@
import java.util.Map;
import java.util.Set;

import static org.labkey.api.util.HttpUtil.Method.POST;

@MethodsAllowed(POST)
@RequiresPermission(InsertPermission.class)
public abstract class AbstractPublishConfirmAction<FORM extends PublishConfirmForm> extends FormViewAction<FORM>
{
Expand Down
20 changes: 1 addition & 19 deletions study/src/org/labkey/study/assay/AssayPublishConfirmAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,10 @@
import org.labkey.api.util.Pair;
import org.labkey.api.view.ActionURL;
import org.labkey.api.view.DataView;
import org.labkey.api.view.HtmlView;
import org.labkey.api.view.NavTree;
import org.labkey.api.view.NotFoundException;
import org.labkey.api.view.UnauthorizedException;
import org.springframework.validation.BindException;
import org.springframework.validation.Errors;
import org.springframework.web.servlet.ModelAndView;

import java.util.HashMap;
import java.util.List;
Expand All @@ -58,7 +55,7 @@ public static class AssayPublishConfirmForm extends PublishConfirmForm
private ExpProtocol _protocol;
private AssayProvider _provider;

ExpProtocol getProtocol()
@NotNull ExpProtocol getProtocol()
{
if (_protocol == null)
{
Expand Down Expand Up @@ -286,21 +283,6 @@ protected ActionURL linkToStudy(AssayPublishConfirmForm form, Container targetSt
return form.getProvider().linkToStudy(getUser(), getContainer(), _protocol, targetStudy, form.getAutoLinkCategory(), publishData, publishErrors);
}

@Override
public ModelAndView getView(AssayPublishConfirmForm form, boolean reshow, BindException errors) throws Exception
{
if (form.getProtocol() == null)
Comment thread
labkey-nicka marked this conversation as resolved.
return HtmlView.err("Could not resolve the source protocol.");

return super.getView(form, reshow, errors);
}

@Override
public boolean handlePost(AssayPublishConfirmForm form, BindException errors) throws Exception
{
return super.handlePost(form, errors);
}

@Override
public void addNavTrail(NavTree root)
{
Expand Down
11 changes: 0 additions & 11 deletions study/src/org/labkey/study/controllers/publish/SampleTypePublishConfirmAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@
import org.labkey.api.study.publish.StudyPublishService;
import org.labkey.api.util.Pair;
import org.labkey.api.view.ActionURL;
import org.labkey.api.view.HtmlView;
Comment thread
labkey-nicka marked this conversation as resolved.
import org.labkey.api.view.NavTree;
import org.labkey.api.view.NotFoundException;
import org.springframework.validation.BindException;
import org.springframework.validation.Errors;
import org.springframework.web.servlet.ModelAndView;

import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -201,15 +199,6 @@ protected ActionURL linkToStudy(SampleTypePublishConfirmForm form, Container tar
dataMaps, ROW_ID, errors);
}

@Override
public ModelAndView getView(SampleTypePublishConfirmForm form, boolean reshow, BindException errors) throws Exception
{
if (_sampleType == null)
Comment thread
labkey-tchad marked this conversation as resolved.
return HtmlView.err("Could not resolve the source Sample Type.");

return super.getView(form, reshow, errors);
}

@Override
public void addNavTrail(NavTree root)
{
Expand Down