1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/f3c381ec1446/ Changeset: f3c381ec1446 User: martenson Date: 2013-09-24 19:29:55 Summary: registration warning message will show based on configuration, it is probably not relevant for other instances than the main Affected #: 4 files

diff -r 746d156319c1ed2ba80fab5a1a5f181fcd4a1758 -r f3c381ec1446562e5a95ae9f5feeac8e330f4ec9 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -136,6 +136,7 @@ self.user_activation_on = kwargs.get( 'user_activation_on', None ) self.activation_grace_period = kwargs.get( 'activation_grace_period', None ) self.inactivity_box_content = kwargs.get( 'inactivity_box_content', None ) + self.registration_warning_message = kwargs.get( 'registration_warning_message', None ) # Get the disposable email domains blacklist file and its contents self.blacklist_location = kwargs.get( 'blacklist_file', None ) self.blacklist_content = None

diff -r 746d156319c1ed2ba80fab5a1a5f181fcd4a1758 -r f3c381ec1446562e5a95ae9f5feeac8e330f4ec9 lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -640,6 +640,8 @@ user_type_fd_id_select_field = None user_type_form_definition = None widgets = [] + # Warning message that is shown on the registration page. + registration_warning_message = trans.app.config.registration_warning_message return trans.fill_template( '/user/register.mako', cntrller=cntrller, email=email, @@ -652,6 +654,7 @@ redirect=redirect, redirect_url=redirect_url, refresh_frames=refresh_frames, + registration_warning_message=registration_warning_message, message=message, status=status )

diff -r 746d156319c1ed2ba80fab5a1a5f181fcd4a1758 -r f3c381ec1446562e5a95ae9f5feeac8e330f4ec9 templates/user/register.mako --- a/templates/user/register.mako +++ b/templates/user/register.mako @@ -107,9 +107,11 @@ <input type="submit" name="create_user_button" value="Submit"/></div></form> + %if registration_warning_message: <div class="alert alert-danger" style="margin: 30px 12px 12px 12px;"> - Please register only one account - we provide this service free of charge and have limited computational resources. Multi-accounts are tracked and will be subjected to account termination and data deletion. + ${registration_warning_message} </div> + %endif </div></%def>

diff -r 746d156319c1ed2ba80fab5a1a5f181fcd4a1758 -r f3c381ec1446562e5a95ae9f5feeac8e330f4ec9 universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample +++ b/universe_wsgi.ini.sample @@ -275,6 +275,10 @@ # during the registration. If their address domain matches any domain in the BL they are refused the registration. #blacklist_file = config/disposable_email_blacklist.conf

+# Registration warning message is used to discourage people from registering multiple accounts. Applies mostly for the main Galaxy instance. +# If no message specified the warning box will not be shown. +#registration_warning_message = Please register only one account - we provide this service free of charge and have limited computational resources. Multi-accounts are tracked and will be subjected to account termination and data deletion. +

# -- Account activation

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.