1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/4d014ec703b0/
Changeset: 4d014ec703b0
User: Dave Bouvier
Date: 2013-09-25 19:46:43
Summary: Use eggs.require instead of pkg_resources.require
Affected #: 1 file
diff -r 3640bed9d3a98e286b2c3d65125868be3d6473c1 -r 4d014ec703b04b0bdef198b58412ec88ae20cb41 lib/tool_shed/galaxy_install/migrate/check.py
--- a/lib/tool_shed/galaxy_install/migrate/check.py
+++ b/lib/tool_shed/galaxy_install/migrate/check.py
@@ -29,7 +29,7 @@
try:
egg = dialect_to_egg[ dialect ]
try:
- pkg_resources.require( egg )
+ eggs.require( egg )
log.debug( "%s egg successfully loaded for %s dialect" % ( egg, dialect ) )
except:
# If the module is in the path elsewhere (i.e. non-egg), it'll still load.
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/22cfae4b6a22/
Changeset: 22cfae4b6a22
User: martenson
Date: 2013-09-24 23:01:23
Summary: repair the newly introduced bug with registration warning message throwing error in toolshed, now it is disabled there
Affected #: 1 file
diff -r 6838d5bb7e557ae6b5118dd6f76749dd5a6e31fb -r 22cfae4b6a227c385146d5d71c49a663809244e8 lib/galaxy/webapps/galaxy/controllers/user.py
--- a/lib/galaxy/webapps/galaxy/controllers/user.py
+++ b/lib/galaxy/webapps/galaxy/controllers/user.py
@@ -637,12 +637,13 @@
user_type_fd_id = trans.security.encode_id( user_type_form_definition.id )
user_type_fd_id_select_field = self.__build_user_type_fd_id_select_field( trans, selected_value=user_type_fd_id )
widgets = self.__get_widgets( trans, user_type_form_definition, user=None, **kwd )
+ # Warning message that is shown on the registration page.
+ registration_warning_message = trans.app.config.registration_warning_message
else:
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
+ registration_warning_message = None
return trans.fill_template( '/user/register.mako',
cntrller=cntrller,
email=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.
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.