Skip to content

26.3 fb arrival departure permissions #1748

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
Ohsudev wants to merge 2 commits into
base: release26.3-SNAPSHOT
Choose a base branch
from
Open

26.3 fb arrival departure permissions #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c33ea4a
Created a new Arrival-Departure Admin permission group.
Jun 3, 2026
45d57bb
Created a new Arrival-Departure Admin permission group.
Jun 3, 2026
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
16 changes: 16 additions & 0 deletions onprc_ehr/src/org/labkey/onprc_ehr/dataentry/BirthFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -106,5 +110,17 @@ protected List<String> 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();
}


}
8 changes: 7 additions & 1 deletion onprc_ehr/src/org/labkey/onprc_ehr/dataentry/FlagsFormType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ protected boolean canInsert()
return canInsert;
}

//Added: 8-7-2024 R.Blasa
//Added: 6-3-26 R.Blasa
@Override
public boolean isVisible()
{
Expand All @@ -98,6 +98,12 @@ public boolean isVisible()
{
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();
}

}