diff --git a/wagtail/admin/filters.py b/wagtail/admin/filters.py index b129e1f77d..baa24e3f40 100644 --- a/wagtail/admin/filters.py +++ b/wagtail/admin/filters.py @@ -112,9 +112,10 @@ class LockedPagesReportFilterSet(WagtailFilterSet): def get_requested_by_queryset(request): - return get_user_model().objects.filter( + User = get_user_model() + return User.objects.filter( pk__in=set(WorkflowState.objects.values_list('requested_by__pk', flat=True)) - ).order_by('username') + ).order_by(User.USERNAME_FIELD) class WorkflowReportFilterSet(WagtailFilterSet): @@ -176,9 +177,10 @@ class WorkflowTasksReportFilterSet(WagtailFilterSet): def get_audit_log_users_queryset(request): - return get_user_model().objects.filter( + User = get_user_model() + return User.objects.filter( pk__in=set(PageLogEntry.objects.values_list('user__pk', flat=True)) - ).order_by('username') + ).order_by(User.USERNAME_FIELD) class SiteHistoryReportFilterSet(WagtailFilterSet):