2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/cbd0a239259b/ Changeset: cbd0a239259b Branch: next-stable User: davebgx Date: 2014-05-23 16:00:33 Summary: Fix server error when registering a new account. Affected #: 1 file
diff -r 2b0cdcea282b2ea92b649df9a5d63f40b2bd545f -r cbd0a239259b694afadfc62bdde820eef0c30b4f lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -1144,9 +1144,9 @@ return "A public user name is required in the tool shed." if username in [ 'repos' ]: return "The term <b>%s</b> is a reserved word in the tool shed, so it cannot be used as a public user name." % username - message = "\n".join(validate_email( trans, email ), - validate_password( trans, password, confirm ), - validate_publicname( trans, username )) + message = "\n".join( [ validate_email( trans, email ), + validate_password( trans, password, confirm ), + validate_publicname( trans, username ) ] ).rstrip() if not message: if trans.webapp.name == 'galaxy': if self.get_all_forms( trans,
https://bitbucket.org/galaxy/galaxy-central/commits/89bdb65761f6/ Changeset: 89bdb65761f6 User: davebgx Date: 2014-05-23 16:01:07 Summary: Merge with next-stable. Affected #: 1 file
diff -r af76f0273d3de8ccc38f78dfb0aae9974574aa7b -r 89bdb65761f631921d3a21cfd2335103715de5bb lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -1144,9 +1144,9 @@ return "A public user name is required in the tool shed." if username in [ 'repos' ]: return "The term <b>%s</b> is a reserved word in the tool shed, so it cannot be used as a public user name." % username - message = "\n".join(validate_email( trans, email ), - validate_password( trans, password, confirm ), - validate_publicname( trans, username )) + message = "\n".join( [ validate_email( trans, email ), + validate_password( trans, password, confirm ), + validate_publicname( trans, username ) ] ).rstrip() if not message: if trans.webapp.name == 'galaxy': if self.get_all_forms( trans,
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.
galaxy-commits@lists.galaxyproject.org