details: http://www.bx.psu.edu/hg/galaxy/rev/bac909f808c2 changeset: 2707:bac909f808c2 user: Greg Von Kuster <greg@bx.psu.edu> date: Thu Sep 17 09:08:37 2009 -0400 description: Two fixes - functional tests should pass. 3 file(s) affected in this change: lib/galaxy/web/controllers/admin.py lib/galaxy/web/controllers/user.py templates/admin/user/grid.mako diffs (39 lines): diff -r a9c4d314ac89 -r bac909f808c2 lib/galaxy/web/controllers/admin.py --- a/lib/galaxy/web/controllers/admin.py Wed Sep 16 16:00:09 2009 -0400 +++ b/lib/galaxy/web/controllers/admin.py Thu Sep 17 09:08:37 2009 -0400 @@ -539,8 +539,8 @@ message = 'Enter a real email address' elif len( email) > 255: message = 'Email address exceeds maximum allowable length' - elif trans.app.model.User.filter( trans.app.model.User.table.c.email==email ).first(): - message = 'A user with that email already exists' + elif trans.app.model.User.filter_by( email=email ).all(): + message = 'User with that email already exists' elif len( password ) < 6: message = 'Use a password of at least 6 characters' elif password != confirm: diff -r a9c4d314ac89 -r bac909f808c2 lib/galaxy/web/controllers/user.py --- a/lib/galaxy/web/controllers/user.py Wed Sep 16 16:00:09 2009 -0400 +++ b/lib/galaxy/web/controllers/user.py Thu Sep 17 09:08:37 2009 -0400 @@ -177,8 +177,7 @@ email_error = "Please enter a real email address" elif len( email ) > 255: email_error = "Email address exceeds maximum allowable length" - elif trans.app.model.User.filter( and_( trans.app.model.User.table.c.email==email, - trans.app.model.User.table.c.deleted==False ) ).first(): + elif trans.app.model.User.filter_by( email=email ).all(): email_error = "User with that email already exists" elif len( password ) < 6: password_error = "Please use a password of at least 6 characters" diff -r a9c4d314ac89 -r bac909f808c2 templates/admin/user/grid.mako --- a/templates/admin/user/grid.mako Wed Sep 16 16:00:09 2009 -0400 +++ b/templates/admin/user/grid.mako Thu Sep 17 09:08:37 2009 -0400 @@ -95,7 +95,7 @@ No users were returned for the current query. Click the Show all users button or a letter below. %endif: <% - letters = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', '0'] + letters = ['A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'] %> <div class="toolFormBody"> <div class="form-row">