1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/6838d5bb7e55/ Changeset: 6838d5bb7e55 User: greg Date: 2013-09-24 22:50:36 Summary: Re-add fix to eliminate email message from the paster log for email verification at user registration that was eliminate din a merge conflict. Affected #: 1 file
diff -r dd1e1bdfcd8254918d6216fd264c2e6698beebfb -r 6838d5bb7e557ae6b5118dd6f76749dd5a6e31fb lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -725,7 +725,7 @@ status = 'error' success = False else: - if trans.webapp.name == 'galaxy': + if trans.webapp.name == 'galaxy' and trans.app.config.user_activation_on: is_activation_sent = self.send_verification_email( trans, email ) if is_activation_sent: message = 'Now logged in as %s.<br>Verification email has been sent to your email address. Please verify it by clicking the activation link in the email.<br><a target="_top" href="%s">Return to the home page.</a>' % ( user.email, url_for( '/' ) ) @@ -735,6 +735,9 @@ if trans.app.config.admin_email is not None: message += 'Contact: %s' % trans.app.config.admin_email success = False + else: # User activation is OFF, proceed without sending the activation email. + message = 'Now logged in as %s.<br><a target="_top" href="%s">Return to the home page.</a>' % ( user.email, url_for( '/' ) ) + success = True return ( message, status, user, success )
def send_verification_email( self, trans, email ):
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.