diff --git a/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java b/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java index 660bb8c04853765661e93c76d8285af02dc5c1f0..6c967ab5c25e1c2b38fea7e890207cc87a695654 100644 --- a/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java +++ b/src/main/java/org/nrg/xnat/turbine/utils/ProjectAccessRequest.java @@ -21,7 +21,6 @@ import org.nrg.xdat.om.XnatProjectdata; import org.nrg.xdat.security.UserGroupI; import org.nrg.xdat.security.helpers.Groups; import org.nrg.xdat.security.helpers.UserHelper; -import org.nrg.xdat.turbine.utils.AdminUtils; import org.nrg.xft.XFTTable; import org.nrg.xft.db.ItemAccessHistory; import org.nrg.xft.db.PoolDBUtils; @@ -524,7 +523,7 @@ public class ProjectAccessRequest { try { for (Map.Entry<String, UserGroupI> entry : Groups.getGroupsForUser(user).entrySet()) { - if (entry.getValue().getTag().equals(_projectId)) { + if (StringUtils.equals(entry.getValue().getTag(),_projectId)) { if(!UserHelper.getUserHelperService(user).isOwner(_projectId)){ Groups.removeUserFromGroup(user, entry.getValue().getId(), eventInfo); } diff --git a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml index ec12b48c398785a71f22ccab393a12f38e7fa02a..c5df1de15c47f4fa02440ee827b66fb09ba870b2 100644 --- a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml +++ b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml @@ -953,7 +953,7 @@ registrationOptions: name: par label: "Auto-enable with Project Access Request?" description: > - If true, user accounts created when accepting project access requests will always be enabled (ane verified) automatically. If false, + If true, user accounts created when accepting project access requests will always be enabled (and verified) automatically. If false, user accounts will only be enabled automatically if "Auto-enable User Registration?" is true. So this setting determines whether project access requests should override how user registration is normally handled. Either way the administrator receives an email notification when a user registers.