From 464d81a75f816589726e2e83775d379fb9acc5e9 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 18 Mar 2026 16:14:58 -0700 Subject: [PATCH] Stop passing SecurityPolicy parameter to Role.isApplicable() --- .../onprc_ehr/security/ONPRC_EHRCMUAdministrationRole.java | 3 +-- .../security/ONPRC_EHRCMUMedicationAdministrationRole.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUAdministrationRole.java b/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUAdministrationRole.java index 58415a504..766223cdd 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUAdministrationRole.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUAdministrationRole.java @@ -18,7 +18,6 @@ import org.labkey.api.data.Container; import org.labkey.api.module.ModuleLoader; import org.labkey.api.security.SecurableResource; -import org.labkey.api.security.SecurityPolicy; import org.labkey.api.security.permissions.DeletePermission; import org.labkey.api.security.permissions.InsertPermission; import org.labkey.api.security.permissions.ReadPermission; @@ -43,7 +42,7 @@ public ONPRC_EHRCMUAdministrationRole() ); } @Override - public boolean isApplicable(SecurityPolicy policy, SecurableResource resource) + public boolean isApplicable(SecurableResource resource) { return resource instanceof Container ? ((Container)resource).getActiveModules().contains(ModuleLoader.getInstance().getModule(ONPRC_EHRModule.class)) : false; } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUMedicationAdministrationRole.java b/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUMedicationAdministrationRole.java index 6b347ea7e..931bf6eb2 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUMedicationAdministrationRole.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/security/ONPRC_EHRCMUMedicationAdministrationRole.java @@ -18,7 +18,6 @@ import org.labkey.api.data.Container; import org.labkey.api.module.ModuleLoader; import org.labkey.api.security.SecurableResource; -import org.labkey.api.security.SecurityPolicy; import org.labkey.api.security.permissions.DeletePermission; import org.labkey.api.security.permissions.InsertPermission; import org.labkey.api.security.permissions.ReadPermission; @@ -42,7 +41,7 @@ public ONPRC_EHRCMUMedicationAdministrationRole() ); } @Override - public boolean isApplicable(SecurityPolicy policy, SecurableResource resource) + public boolean isApplicable(SecurableResource resource) { return resource instanceof Container ? ((Container)resource).getActiveModules().contains(ModuleLoader.getInstance().getModule(ONPRC_EHRModule.class)) : false; }