Merge remote-tracking branch 'origin/main' into nl/2136-CISA-rep-additional-details

This commit is contained in:
CocoByte 2024-06-12 22:36:18 -06:00
commit 9cb3dc5956
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
2 changed files with 4 additions and 8 deletions

View file

@ -1181,6 +1181,8 @@ class DomainInvitationAdmin(ListHeaderAdmin):
# error.
readonly_fields = ["status"]
autocomplete_fields = ["domain"]
change_form_template = "django/admin/email_clipboard_change_form.html"
# Select domain invitations to change -> Domain invitations

View file

@ -381,6 +381,7 @@ def export_data_type_to_csv(csv_file):
"""
All domains report with extra columns.
This maps to the "All domain metadata" button.
Exports domains of all statuses.
"""
writer = csv.writer(csv_file)
@ -408,15 +409,8 @@ def export_data_type_to_csv(csv_file):
"federal_agency",
"domain__name",
]
filter_condition = {
"domain__state__in": [
Domain.State.READY,
Domain.State.DNS_NEEDED,
Domain.State.ON_HOLD,
],
}
write_csv_for_domains(
writer, columns, sort_fields, filter_condition, should_get_domain_managers=True, should_write_header=True
writer, columns, sort_fields, filter_condition={}, should_get_domain_managers=True, should_write_header=True
)