From 52b152ed7b654eace53e1f9ec11f30a45d931c2d Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 7 Mar 2023 15:31:31 +0100
Subject: [PATCH] Fix: Add roles to template when user is orgasmin
[VIPSUTV-429]
---
.../nibio/vips/logic/controller/servlet/UserController.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java b/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
index fc9eeadf..bc79612b 100755
--- a/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
+++ b/src/main/java/no/nibio/vips/logic/controller/servlet/UserController.java
@@ -102,6 +102,11 @@ public class UserController extends HttpServlet {
request.setAttribute("organizations", organizations);
request.setAttribute("vipsLogicRoles", em.createNamedQuery("VipsLogicRole.findAll").getResultList());
}
+ else if(user.isOrganizationAdmin())
+ {
+ request.setAttribute("vipsLogicRoles", em.createNamedQuery("VipsLogicRole.findAll").getResultList());
+ users = userBean.getUsers(user.getOrganizationId());
+ }
else
{
users = userBean.getUsers(user.getOrganizationId());
--
GitLab