From 238f2337b7b4a12da2b7e751966e436d6f101bd3 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 18 Mar 2026 16:14:56 -0700 Subject: [PATCH] Stop passing SecurityPolicy parameter to Role.isApplicable() --- .../security/CopyTargetedMSExperimentRole.java | 3 +-- .../panoramapublic/security/PanoramaPublicSubmitterRole.java | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/panoramapublic/src/org/labkey/panoramapublic/security/CopyTargetedMSExperimentRole.java b/panoramapublic/src/org/labkey/panoramapublic/security/CopyTargetedMSExperimentRole.java index d624b484..8d7af28b 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/security/CopyTargetedMSExperimentRole.java +++ b/panoramapublic/src/org/labkey/panoramapublic/security/CopyTargetedMSExperimentRole.java @@ -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; @@ -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 } diff --git a/panoramapublic/src/org/labkey/panoramapublic/security/PanoramaPublicSubmitterRole.java b/panoramapublic/src/org/labkey/panoramapublic/security/PanoramaPublicSubmitterRole.java index 97b13f97..6740d8f4 100644 --- a/panoramapublic/src/org/labkey/panoramapublic/security/PanoramaPublicSubmitterRole.java +++ b/panoramapublic/src/org/labkey/panoramapublic/security/PanoramaPublicSubmitterRole.java @@ -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; @@ -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();