opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_20.01' into release_20.05

Browse Source
This commit is contained in:
Nicola Soranzo
2020-10-13 02:47:57 +01:00
parent d942952fbc 05aa4c28d6
commit 3395d725e3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/controllers/user.py
+2 -1
View File
@@ -138,7 +138,8 @@ class User(BaseUIController, UsesFormDefinitionsMixin, CreatesApiKeysMixin):
trans.app.model.User.table.c.email == login,
trans.app.model.User.table.c.username == login
)).first()
if not user and login.lower() != login:
if not user:
# Try a case-insensitive match on the email
user = trans.sa_session.query(trans.app.model.User).filter(
func.lower(trans.app.model.User.table.c.email) == login.lower()
).first()