mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-22 09:11:04 +02:00
Merge branch 'main' into nl/3011-fix-request-growth-report-data
This commit is contained in:
commit
ef8ddccb15
104 changed files with 4355 additions and 2300 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue