From c33ea4a8db42758ed52e4f4d0245931c3cac0f3c Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 3 Jun 2026 14:13:02 -0700 Subject: [PATCH 1/2] Created a new Arrival-Departure Admin permission group. --- .../onprc_ehr/dataentry/BirthFormType.java | 16 ++++++++++++++++ .../onprc_ehr/dataentry/FlagsFormType.java | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java index 54208f1e7..d5b9bc654 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java @@ -21,7 +21,11 @@ import org.labkey.api.ehr.dataentry.TaskForm; import org.labkey.api.ehr.dataentry.TaskFormSection; import org.labkey.api.module.Module; +import org.labkey.api.security.Group; +import org.labkey.api.security.GroupManager; +import org.labkey.api.security.permissions.AdminPermission; import org.labkey.api.view.template.ClientDependency; +import org.labkey.security.xml.GroupEnumType; import java.util.ArrayList; import java.util.Arrays; @@ -106,5 +110,17 @@ protected List getButtonConfigs() return defaultButtons; } + //Added: 6-3-26 R.Blasa + @Override + public boolean isVisible() + { + Group g = GroupManager.getGroup(getCtx().getContainer(), "Arrival-Departure SF", GroupEnumType.SITE); + if (g != null && getCtx().getUser().isInGroup(g.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } + return super.isVisible(); + } + } diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java index 362f42144..0f7fbcf22 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java @@ -89,15 +89,16 @@ protected boolean canInsert() return canInsert; } - //Added: 8-7-2024 R.Blasa + //Added: 6-3-26 R.Blasa @Override public boolean isVisible() { - Group g = GroupManager.getGroup(getCtx().getContainer(), "Death Entry", GroupEnumType.SITE); + Group g = GroupManager.getGroup(getCtx().getContainer(), "Death Entry,Arrival-Departure SF", GroupEnumType.SITE); if (g != null && getCtx().getUser().isInGroup(g.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) { return false; } return super.isVisible(); } + } From 45d57bb7a3aca5483935cf9baec708792fd328b7 Mon Sep 17 00:00:00 2001 From: blasar Date: Wed, 3 Jun 2026 14:46:22 -0700 Subject: [PATCH 2/2] Created a new Arrival-Departure Admin permission group. --- .../src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java index 0f7fbcf22..007fabfd4 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java @@ -93,11 +93,16 @@ protected boolean canInsert() @Override public boolean isVisible() { - Group g = GroupManager.getGroup(getCtx().getContainer(), "Death Entry,Arrival-Departure SF", GroupEnumType.SITE); + Group g = GroupManager.getGroup(getCtx().getContainer(), "Death Entry", GroupEnumType.SITE); if (g != null && getCtx().getUser().isInGroup(g.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) { return false; } + Group h = GroupManager.getGroup(getCtx().getContainer(), "Arrival-Departure SF", GroupEnumType.SITE); + if (h != null && getCtx().getUser().isInGroup(h.getUserId()) && !getCtx().getContainer().hasPermission(getCtx().getUser(), AdminPermission.class)) + { + return false; + } return super.isVisible(); }