[galaxy-commits] commit/galaxy-central: 5 new changesets

5 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/8ed933747f9a/ Changeset: 8ed933747f9a Branch: next-stable User: dannon Date: 2014-12-04 15:27:08+00:00 Summary: changeset: 15487:c8791bdcbdde user: Dannon Baker <dannonbaker@me.com> date: Tue Dec 02 09:40:10 2014 -0500 files: lib/galaxy/webapps/galaxy/controllers/user.py description: Remove never-used success vars. Affected #: 1 file diff -r 0cfba5087d81c4bd0add051cf1d0ab48d8a33cce -r 8ed933747f9acebc51de16939cca3e48533c3305 lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -1022,12 +1022,10 @@ is_activation_sent = self.send_verification_email( trans, user.email, user.username ) if is_activation_sent: message = 'The login information has been updated with the changes.<br>Verification email has been sent to your new email address. Please verify it by clicking the activation link in the email.<br>Please check your spam/trash folder in case you cannot find the message.' - success = True else: message = 'Unable to send activation email, please contact your local Galaxy administrator.' if trans.app.config.error_email_to is not None: message += ' Contact: %s' % trans.app.config.error_email_to - success = False if ( user.username != username ): user.username = username trans.sa_session.add( user ) https://bitbucket.org/galaxy/galaxy-central/commits/4dd689ca4e4f/ Changeset: 4dd689ca4e4f Branch: next-stable User: dannon Date: 2014-12-04 15:56:33+00:00 Summary: Fix indentation to a multiple of 4. Affected #: 1 file diff -r 8ed933747f9acebc51de16939cca3e48533c3305 -r 4dd689ca4e4f1f2148abd67639fba2e48466716f lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -1539,7 +1539,7 @@ @web.require_login( "to undelete addresses" ) @web.expose def undelete_address( self, trans, cntrller, address_id=None, **kwd ): - return self.__delete_undelete_address( trans, cntrller, 'undelete', address_id=address_id, **kwd ) + return self.__delete_undelete_address( trans, cntrller, 'undelete', address_id=address_id, **kwd ) def __delete_undelete_address( self, trans, cntrller, op, address_id=None, **kwd ): is_admin = cntrller == 'admin' and trans.user_is_admin() https://bitbucket.org/galaxy/galaxy-central/commits/52bca602fda1/ Changeset: 52bca602fda1 Branch: next-stable User: dannon Date: 2014-12-04 16:00:36+00:00 Summary: Remove another unused variable in the redirect code. Affected #: 1 file diff -r 4dd689ca4e4f1f2148abd67639fba2e48466716f -r 52bca602fda1f49cdd686607cc4b4c3b4943f59d lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -1739,7 +1739,6 @@ def __get_redirect_url( self, redirect ): root_url = url_for( '/', qualified=True ) - redirect_url = '' # always start with redirect_url being empty # compare urls, to prevent a redirect from pointing (directly) outside of galaxy # or to enter a logout/login loop if not util.compare_urls( root_url, redirect, compare_path=False ) or util.compare_urls( url_for( controller='user', action='logout', qualified=True ), redirect ): https://bitbucket.org/galaxy/galaxy-central/commits/29b2c328b89b/ Changeset: 29b2c328b89b Branch: next-stable User: dannon Date: 2014-12-04 16:09:30+00:00 Summary: Import cleanup in user controller prior to merging password work. Affected #: 1 file diff -r 52bca602fda1f49cdd686607cc4b4c3b4943f59d -r 29b2c328b89b6634c9a3f9a21c2349105a7e485a lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -5,32 +5,30 @@ import glob import logging import os +import random import socket import string -import random import urllib + +from datetime import datetime, timedelta + +from galaxy import model +from galaxy import util from galaxy import web -from galaxy import util -from galaxy import model from galaxy.model.orm import and_ -from galaxy.security.validate_user_input import validate_email -from galaxy.security.validate_user_input import validate_publicname -from galaxy.security.validate_user_input import validate_password -from galaxy.security.validate_user_input import transform_publicname -from galaxy.util.json import loads -from galaxy.util.json import dumps -from galaxy.util import listify -from galaxy.util import docstring_trim +from galaxy.security.validate_user_input import (transform_publicname, + validate_email, + validate_password, + validate_publicname) +from galaxy.util import biostar, hash_util, docstring_trim, listify +from galaxy.util.json import dumps, loads from galaxy.web import url_for -from galaxy.web.base.controller import BaseUIController -from galaxy.web.base.controller import UsesFormDefinitionsMixin -from galaxy.web.base.controller import CreatesUsersMixin -from galaxy.web.base.controller import CreatesApiKeysMixin -from galaxy.web.form_builder import CheckboxField -from galaxy.web.form_builder import build_select_field -from galaxy.web.framework.helpers import time_ago, grids, escape -from datetime import datetime, timedelta -from galaxy.util import hash_util, biostar +from galaxy.web.base.controller import (BaseUIController, + CreatesApiKeysMixin, + CreatesUsersMixin, + UsesFormDefinitionsMixin) +from galaxy.web.form_builder import build_select_field, CheckboxField +from galaxy.web.framework.helpers import escape, grids, time_ago log = logging.getLogger( __name__ ) https://bitbucket.org/galaxy/galaxy-central/commits/b8dea58ea20e/ Changeset: b8dea58ea20e User: dannon Date: 2014-12-04 16:10:26+00:00 Summary: Merge next-stable to default. Affected #: 1 file diff -r 2cdf98534410d48b1a10c03eec30901979955aca -r b8dea58ea20ef71e4b30beae636042ffc44d348e lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -5,32 +5,30 @@ import glob import logging import os +import random import socket import string -import random import urllib + +from datetime import datetime, timedelta + +from galaxy import model +from galaxy import util from galaxy import web -from galaxy import util -from galaxy import model from galaxy.model.orm import and_ -from galaxy.security.validate_user_input import validate_email -from galaxy.security.validate_user_input import validate_publicname -from galaxy.security.validate_user_input import validate_password -from galaxy.security.validate_user_input import transform_publicname -from galaxy.util.json import loads -from galaxy.util.json import dumps -from galaxy.util import listify -from galaxy.util import docstring_trim +from galaxy.security.validate_user_input import (transform_publicname, + validate_email, + validate_password, + validate_publicname) +from galaxy.util import biostar, hash_util, docstring_trim, listify +from galaxy.util.json import dumps, loads from galaxy.web import url_for -from galaxy.web.base.controller import BaseUIController -from galaxy.web.base.controller import UsesFormDefinitionsMixin -from galaxy.web.base.controller import CreatesUsersMixin -from galaxy.web.base.controller import CreatesApiKeysMixin -from galaxy.web.form_builder import CheckboxField -from galaxy.web.form_builder import build_select_field -from galaxy.web.framework.helpers import time_ago, grids, escape -from datetime import datetime, timedelta -from galaxy.util import hash_util, biostar +from galaxy.web.base.controller import (BaseUIController, + CreatesApiKeysMixin, + CreatesUsersMixin, + UsesFormDefinitionsMixin) +from galaxy.web.form_builder import build_select_field, CheckboxField +from galaxy.web.framework.helpers import escape, grids, time_ago log = logging.getLogger( __name__ ) @@ -1022,12 +1020,10 @@ is_activation_sent = self.send_verification_email( trans, user.email, user.username ) if is_activation_sent: message = 'The login information has been updated with the changes.<br>Verification email has been sent to your new email address. Please verify it by clicking the activation link in the email.<br>Please check your spam/trash folder in case you cannot find the message.' - success = True else: message = 'Unable to send activation email, please contact your local Galaxy administrator.' if trans.app.config.error_email_to is not None: message += ' Contact: %s' % trans.app.config.error_email_to - success = False if ( user.username != username ): user.username = username trans.sa_session.add( user ) @@ -1542,7 +1538,7 @@ @web.require_login( "to undelete addresses" ) @web.expose def undelete_address( self, trans, cntrller, address_id=None, **kwd ): - return self.__delete_undelete_address( trans, cntrller, 'undelete', address_id=address_id, **kwd ) + return self.__delete_undelete_address( trans, cntrller, 'undelete', address_id=address_id, **kwd ) def __delete_undelete_address( self, trans, cntrller, op, address_id=None, **kwd ): is_admin = cntrller == 'admin' and trans.user_is_admin() @@ -1742,7 +1738,6 @@ def __get_redirect_url( self, redirect ): root_url = url_for( '/', qualified=True ) - redirect_url = '' # always start with redirect_url being empty # compare urls, to prevent a redirect from pointing (directly) outside of galaxy # or to enter a logout/login loop if not util.compare_urls( root_url, redirect, compare_path=False ) or util.compare_urls( url_for( controller='user', action='logout', qualified=True ), redirect ): 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.