Merge branch 'master' into work

src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java

@@ -105,9 +105,8 @@ public class XDATRegisterUser extends org.nrg.xdat.turbine.modules.actions.XDATR
         }
     }
 
-	@Override
 	public boolean autoApproval(RunData data, Context context) throws Exception {
-		boolean autoApproval = super.autoApproval(data, context);
+		boolean autoApproval = XDAT.getSiteConfigPreferences().getUserRegistration();
 
 		if (autoApproval) {
             logger.debug("Auto-approval for registration came from super...");

src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml

@@ -947,6 +947,16 @@ registrationOptions:
                 If true, user accounts will be enabled automatically when the user registers. Users will be able to access the site and any 'public'
                 projects immediately. If false, the site administrator will be required to manually enable user accounts. Either way the administrator
                 receives an email notification when a user registers.
+        autoEnablePar:
+            kind: panel.input.checkbox
+            id: autoEnablePar
+            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,
+                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.
         uiAllowNewUserComments:
             kind: panel.input.checkbox
             id: uiAllowNewUserComments