From 098817c9af1ec16108170449dcb710949199883b Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Wed, 21 Mar 2018 10:23:58 +0100
Subject: [PATCH] Bugfix: Allowing organization admins to edit password
---
.../vips/logic/controller/servlet/UserController.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
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 c0477858..637570b5 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
@@ -315,8 +315,11 @@ public class UserController extends HttpServlet {
String messageKey = "";
if(userId > 0)
{
- // Superuser can change username and password
- if(user.isSuperUser())
+ // Superuser can change username and password for everyone
+ // Organization admin can change username and password for members of on organization
+ if(user.isSuperUser() ||
+ (user.isOrganizationAdmin() && viewUser.getOrganization_id().equals(user.getOrganization_id()))
+ )
{
UserAuthentication auth = viewUser.getPasswordAuthentication();
auth.setUsername(username);
--
GitLab