Unverified Commit 1f0984e4 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #18694 from jdavcs/24.1_admin_sort_last_login 

[24.1] Fix sorting users in admin by last login
parents 0bc1a46b 886cd1b3

lib/galaxy/webapps/galaxy/controllers/admin.py

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class UserListGrid(grids.GridData): 
                .group_by(model.GalaxySession.table.c.user_id)

                .subquery()

            )

            query = query.outerjoin((last_login_subquery, model.User.table.c.id == last_login_subquery.c.user_id))

            query = query.outerjoin(last_login_subquery, model.User.table.c.id == last_login_subquery.c.user_id)



            if not ascending:

                query = query.order_by((last_login_subquery.c.last_login).desc().nullslast())