Skip to content

Commit 7806be4

Browse files
Filter admin and dev from SND permission UI (#943)
1 parent b960cb8 commit 7806be4

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

snd/src/org/labkey/snd/security/view/categorySecurity.jsp

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,19 @@
1515
* limitations under the License.
1616
*/
1717
%>
18+
<%@ page import="org.labkey.api.data.ContainerManager" %>
1819
<%@ page import="org.labkey.api.security.Group" %>
1920
<%@ page import="org.labkey.api.security.SecurityPolicy" %>
2021
<%@ page import="org.labkey.api.security.SecurityPolicyManager" %>
22+
<%@ page import="org.labkey.api.security.permissions.AdminOperationsPermission" %>
23+
<%@ page import="org.labkey.api.security.permissions.PlatformDeveloperPermission" %>
2124
<%@ page import="org.labkey.api.security.roles.Role" %>
2225
<%@ page import="org.labkey.api.snd.Category" %>
2326
<%@ page import="org.labkey.api.snd.SNDService" %>
2427
<%@ page import="org.labkey.snd.SNDController.AdminAction" %>
2528
<%@ page import="org.labkey.snd.SNDController.CategorySecurityAction" %>
2629
<%@ page import="org.labkey.snd.security.SNDSecurityManager" %>
30+
<%@ page import="java.util.ArrayList" %>
2731
<%@ page import="java.util.HashMap" %>
2832
<%@ page import="java.util.List" %>
2933
<%@ page import="java.util.Map" %>
@@ -48,9 +52,19 @@
4852
%>
4953

5054
<%
51-
List<Group> validGroups = org.labkey.api.security.SecurityManager.getGroups(getContainer().getProject(), true);
55+
List<Group> groups = org.labkey.api.security.SecurityManager.getGroups(getContainer().getProject(), true);
56+
ArrayList<Group> validGroups = new ArrayList<>();
5257
SNDService sndService = SNDService.get();
5358
SNDSecurityManager sndSecurityManager = SNDSecurityManager.get();
59+
60+
for (Group g : groups)
61+
{
62+
if (ContainerManager.getRoot().hasPermission(g, AdminOperationsPermission.class) || ContainerManager.getRoot().hasPermission(g, PlatformDeveloperPermission.class))
63+
continue;
64+
65+
validGroups.add(g);
66+
}
67+
5468
Map<Integer, Category> categories = sndService.getAllCategories(getContainer(), getUser());
5569
Map<String, Role> roles = sndSecurityManager.getAllSecurityRoles();
5670

0 commit comments

Comments
 (0)