Merge branch 'main' into nl/3011-fix-request-growth-report-data

This commit is contained in:
CuriousX 2025-01-06 13:42:29 -07:00 committed by GitHub
commit ef8ddccb15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
104 changed files with 4355 additions and 2300 deletions

View file

@ -417,7 +417,7 @@ class MemberExport(BaseExport):
# Adding a order_by increases output predictability.
# Doesn't matter as much for normal use, but makes tests easier.
# We should also just be ordering by default anyway.
members = permissions.union(invitations).order_by("email_display")
members = permissions.union(invitations).order_by("email_display", "member_display", "first_name", "last_name")
return convert_queryset_to_dict(members, is_model=False)
@classmethod