details: http://www.bx.psu.edu/hg/galaxy/rev/984b1eb6c428 changeset: 2956:984b1eb6c428 user: Dan Blankenberg dan@bx.psu.edu date: Wed Nov 04 09:32:09 2009 -0500 description: When reseting password, if an email has not yet been provided, make text box empty and not contain 'None'

diffstat:

lib/galaxy/web/controllers/user.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (12 lines):

diff -r d7c66019de13 -r 984b1eb6c428 lib/galaxy/web/controllers/user.py --- a/lib/galaxy/web/controllers/user.py Tue Nov 03 19:16:01 2009 -0500 +++ b/lib/galaxy/web/controllers/user.py Wed Nov 04 09:32:09 2009 -0500 @@ -571,6 +571,8 @@ return trans.show_ok_message( "Password has been reset and emailed to: %s. <a href='%s'>Click here</a> to return to the login form." % ( email, web.url_for( action='login' ) ) ) elif email != None: error = "The specified user does not exist" + elif email is None: + email = "" return trans.show_form( web.FormBuilder( web.url_for(), "Reset Password", submit_text="Submit" ) .add_text( "email", "Email", value=email, error=error ) )