1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b714089d888c/ Changeset: b714089d888c User: martenson Date: 2013-10-03 17:18:59 Summary: activation feature tweaks Affected #: 2 files diff -r becb2b5d2d0690fa5217a8101c6d0b5f8c6dc99d -r b714089d888cad2942ba3edcd968532f07b56143 lib/galaxy/config.py --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -133,7 +133,7 @@ self.mailing_join_addr = kwargs.get('mailing_join_addr',"galaxy-announce-join@bx.psu.edu") self.error_email_to = kwargs.get( 'error_email_to', None ) self.activation_email = kwargs.get( 'activation_email', None ) - self.user_activation_on = kwargs.get( 'user_activation_on', None ) + self.user_activation_on = string_as_bool( kwargs.get( 'user_activation_on', False ) ) 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 ) diff -r becb2b5d2d0690fa5217a8101c6d0b5f8c6dc99d -r b714089d888cad2942ba3edcd968532f07b56143 lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -670,8 +670,10 @@ user = trans.app.model.User( email=email ) user.set_password_cleartext( password ) user.username = username - if trans.app.config.user_activation_on: # Do not set the active flag in case activation is OFF. + if trans.app.config.user_activation_on: user.active = False + else: + user.active = True # Activation is off, every new user is active by default. trans.sa_session.add( user ) trans.sa_session.flush() trans.app.security_agent.create_private_user_role( user ) 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.