Skip to content

Stop passing SecurityPolicy parameter to Role.isApplicable() #617

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

Open
labkey-adam wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Stop passing SecurityPolicy parameter to Role.isApplicable() #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 2 deletions panoramapublic/src/org/labkey/panoramapublic/security/CopyTargetedMSExperimentRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

import org.labkey.api.admin.FolderExportPermission;
import org.labkey.api.security.SecurableResource;
import org.labkey.api.security.SecurityPolicy;
import org.labkey.api.security.permissions.ReadPermission;
import org.labkey.api.security.roles.AbstractRole;

Expand All @@ -38,7 +37,7 @@ public CopyTargetedMSExperimentRole()
}

@Override
public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
public boolean isApplicable(SecurableResource resource)
{
return false; // Do not show in the permission UI
}
Expand Down
5 changes: 2 additions & 3 deletions panoramapublic/src/org/labkey/panoramapublic/security/PanoramaPublicSubmitterRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import org.labkey.api.data.Container;
import org.labkey.api.security.SecurableResource;
import org.labkey.api.security.SecurityPolicy;
import org.labkey.api.security.permissions.ReadPermission;
import org.labkey.api.security.roles.AbstractRole;
import org.labkey.panoramapublic.query.ExperimentAnnotationsManager;
Expand All @@ -20,9 +19,9 @@ public PanoramaPublicSubmitterRole()
}

@Override
public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
public boolean isApplicable(SecurableResource resource)
{
if (super.isApplicable(policy, resource)) // Superclass verifies that the resource is a Container.
if (super.isApplicable(resource)) // Superclass verifies that the resource is a Container.
{
// Show the role on the permissions page of subfolders of the Panorama Public project that have an experiment.
Container project = ((Container)resource).getProject();
Expand Down
Loading