1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/ec5c9d242d9f/ changeset: ec5c9d242d9f user: natefoo date: 2011-09-28 21:41:21 summary: Fix openid_associate upon logging in with an unassociated account, drop Flickr from OpenID since it no longer works (you have to use your photostream URL now). affected #: 1 file (-1 bytes) --- a/lib/galaxy/web/controllers/user.py Wed Sep 28 10:56:30 2011 -0400 +++ b/lib/galaxy/web/controllers/user.py Wed Sep 28 15:41:21 2011 -0400 @@ -28,7 +28,6 @@ OPENID_PROVIDERS = { 'Google' : 'https://www.google.com/accounts/o8/id', 'Yahoo!' : 'http://yahoo.com', 'AOL/AIM' : 'http://openid.aol.com', - 'Flickr' : 'http://flickr.com', 'Launchpad' : 'http://login.launchpad.net', } @@ -195,7 +194,7 @@ message=message, status=status ) ) @web.expose - def openid_associate( self, trans, cntrller, webapp='galaxy', **kwd ): + def openid_associate( self, trans, cntrller='user', webapp='galaxy', **kwd ): if not trans.app.config.enable_openid: return trans.show_error_message( 'OpenID authentication is not enabled in this instance of Galaxy' ) use_panels = util.string_as_bool( kwd.get( 'use_panels', False ) ) @@ -266,7 +265,7 @@ if user_type_fd_id == 'none' and user_type_form_definition is not None: 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( self, trans, user_type_form_definition, user=user, **kwd ) + widgets = self.__get_widgets( trans, user_type_form_definition, user=user, **kwd ) else: user_type_fd_id_select_field = None user_type_form_definition = None 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.