Skip to content
Snippets Groups Projects
Commit ed87654a authored by Mike McKay's avatar Mike McKay
Browse files

XNAT-2650 Made PAR autoenabling configurable.

parent fbbb93f7
No related branches found
No related tags found
No related merge requests found
...@@ -105,9 +105,8 @@ public class XDATRegisterUser extends org.nrg.xdat.turbine.modules.actions.XDATR ...@@ -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 { public boolean autoApproval(RunData data, Context context) throws Exception {
boolean autoApproval = super.autoApproval(data, context); boolean autoApproval = XDAT.getSiteConfigPreferences().getUserRegistration();
if (autoApproval) { if (autoApproval) {
logger.debug("Auto-approval for registration came from super..."); logger.debug("Auto-approval for registration came from super...");
......
...@@ -947,6 +947,16 @@ registrationOptions: ...@@ -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' 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 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. 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: uiAllowNewUserComments:
kind: panel.input.checkbox kind: panel.input.checkbox
id: uiAllowNewUserComments id: uiAllowNewUserComments
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment