Skip to content

Commit 4b9d25d

Browse files
authored
Stop passing SecurityPolicy parameter to Role.isApplicable() (#617)
1 parent 7a8ecd7 commit 4b9d25d

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

panoramapublic/src/org/labkey/panoramapublic/security/CopyTargetedMSExperimentRole.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import org.labkey.api.admin.FolderExportPermission;
1919
import org.labkey.api.security.SecurableResource;
20-
import org.labkey.api.security.SecurityPolicy;
2120
import org.labkey.api.security.permissions.ReadPermission;
2221
import org.labkey.api.security.roles.AbstractRole;
2322

@@ -38,7 +37,7 @@ public CopyTargetedMSExperimentRole()
3837
}
3938

4039
@Override
41-
public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
40+
public boolean isApplicable(SecurableResource resource)
4241
{
4342
return false; // Do not show in the permission UI
4443
}

panoramapublic/src/org/labkey/panoramapublic/security/PanoramaPublicSubmitterRole.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.labkey.api.data.Container;
44
import org.labkey.api.security.SecurableResource;
5-
import org.labkey.api.security.SecurityPolicy;
65
import org.labkey.api.security.permissions.ReadPermission;
76
import org.labkey.api.security.roles.AbstractRole;
87
import org.labkey.panoramapublic.query.ExperimentAnnotationsManager;
@@ -20,9 +19,9 @@ public PanoramaPublicSubmitterRole()
2019
}
2120

2221
@Override
23-
public boolean isApplicable(SecurityPolicy policy, SecurableResource resource)
22+
public boolean isApplicable(SecurableResource resource)
2423
{
25-
if (super.isApplicable(policy, resource)) // Superclass verifies that the resource is a Container.
24+
if (super.isApplicable(resource)) // Superclass verifies that the resource is a Container.
2625
{
2726
// Show the role on the permissions page of subfolders of the Panorama Public project that have an experiment.
2827
Container project = ((Container)resource).getProject();

0 commit comments

Comments
 (0)