From 8338b257c9e457e46176336eebea104debe37dd9 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 5 Feb 2020 12:36:34 -0500 Subject: [PATCH 1/2] Fix reports disk usage query for python 3 --- lib/galaxy/webapps/reports/controllers/users.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/webapps/reports/controllers/users.py b/lib/galaxy/webapps/reports/controllers/users.py index 54cf6645b4c..50ea8fd636b 100644 --- a/lib/galaxy/webapps/reports/controllers/users.py +++ b/lib/galaxy/webapps/reports/controllers/users.py @@ -178,7 +178,9 @@ class Users(BaseUIController, ReportQueryBuilder): user_cutoff = int(kwd.get('user_cutoff', 60)) # disk_usage isn't indexed - users = sorted(trans.sa_session.query(galaxy.model.User).all(), key=operator.attrgetter(str(sort_id)), reverse=_order) + all_users = trans.sa_session.query(galaxy.model.User).all() + sortAttrGetter = operator.attrgetter(str(sort_id)) + users = sorted(all_users, key=lambda x: sortAttrGetter(x) or 0, reverse=_order) if user_cutoff: users = users[:user_cutoff] return trans.fill_template('/webapps/reports/users_user_disk_usage.mako', From 0459e0c1e372826cc8a648c8e2ac8b58b9b88603 Mon Sep 17 00:00:00 2001 From: Dannon Date: Wed, 5 Feb 2020 13:16:10 -0500 Subject: [PATCH 2/2] Apply suggestions from code review Co-Authored-By: Nicola Soranzo --- lib/galaxy/webapps/reports/controllers/users.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/webapps/reports/controllers/users.py b/lib/galaxy/webapps/reports/controllers/users.py index 50ea8fd636b..e8bfcfd1576 100644 --- a/lib/galaxy/webapps/reports/controllers/users.py +++ b/lib/galaxy/webapps/reports/controllers/users.py @@ -179,8 +179,8 @@ class Users(BaseUIController, ReportQueryBuilder): user_cutoff = int(kwd.get('user_cutoff', 60)) # disk_usage isn't indexed all_users = trans.sa_session.query(galaxy.model.User).all() - sortAttrGetter = operator.attrgetter(str(sort_id)) - users = sorted(all_users, key=lambda x: sortAttrGetter(x) or 0, reverse=_order) + sort_attrgetter = operator.attrgetter(str(sort_id)) + users = sorted(all_users, key=lambda x: sort_attrgetter(x) or 0, reverse=_order) if user_cutoff: users = users[:user_cutoff] return trans.fill_template('/webapps/reports/users_user_disk_usage.mako',