exclude deactivated users from role assignment autocomplete #2419 #4475

Restore the query to what it was in previous releases. Put the logic in the method.
IQSS · Mar 17, 2021 · 0efee28 · 0efee28
1 parent 1e985b6
commit 0efee28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java
@@ -376,7 +376,9 @@ public List<RoleAssignee> filterRoleAssignees(String query, DvObject dvObject, L
                 .getResultList().stream()
                 .filter(ra -> roleAssignSelectedRoleAssignees == null || !roleAssignSelectedRoleAssignees.contains(ra))
                 .forEach((ra) -> {
-                    roleAssigneeList.add(ra);
+                    if (!ra.isDeactivated()) {
+                        roleAssigneeList.add(ra);
+                    }
                 });
 
         // now we add groups to the list, both global and explicit

diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java
@@ -56,8 +56,7 @@
     @NamedQuery( name="AuthenticatedUser.filter",
                 query="select au from AuthenticatedUser au WHERE ("
                         + "LOWER(au.userIdentifier) like LOWER(:query) OR "
-                        + "lower(concat(au.firstName,' ',au.lastName)) like lower(:query)) "
-                        + "AND au.deactivated != true"),
+                        + "lower(concat(au.firstName,' ',au.lastName)) like lower(:query))"),
     @NamedQuery( name="AuthenticatedUser.findAdminUser",
                 query="select au from AuthenticatedUser au WHERE "
                         + "au.superuser = true "