Skip to content
Snippets Groups Projects
Commit 52b152ed authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Fix: Add roles to template when user is orgasmin [VIPSUTV-429]

parent 667f7b3f
No related branches found
No related tags found
No related merge requests found
...@@ -102,6 +102,11 @@ public class UserController extends HttpServlet { ...@@ -102,6 +102,11 @@ public class UserController extends HttpServlet {
request.setAttribute("organizations", organizations); request.setAttribute("organizations", organizations);
request.setAttribute("vipsLogicRoles", em.createNamedQuery("VipsLogicRole.findAll").getResultList()); 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 else
{ {
users = userBean.getUsers(user.getOrganizationId()); users = userBean.getUsers(user.getOrganizationId());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment