Merge remote-tracking branch 'origin/main' into nl/1064-Change-domain-application-to-domain-requests

This commit is contained in:
CocoByte 2024-02-29 15:53:04 -07:00
commit 919aacfc23
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F

View file

@ -167,9 +167,12 @@ def write_csv(
max_dm_count = max(len(domain_info.domain.permissions.all()) for domain_info in all_domain_infos) max_dm_count = max(len(domain_info.domain.permissions.all()) for domain_info in all_domain_infos)
update_columns_with_domain_managers(columns, max_dm_count) update_columns_with_domain_managers(columns, max_dm_count)
if should_write_header:
write_header(writer, columns)
for page_num in paginator.page_range: for page_num in paginator.page_range:
page = paginator.page(page_num)
rows = [] rows = []
page = paginator.page(page_num)
for domain_info in page.object_list: for domain_info in page.object_list:
try: try:
row = parse_row(columns, domain_info, security_emails_dict, get_domain_managers) row = parse_row(columns, domain_info, security_emails_dict, get_domain_managers)
@ -180,9 +183,6 @@ def write_csv(
logger.error("csv_export -> Error when parsing row, domain was None") logger.error("csv_export -> Error when parsing row, domain was None")
continue continue
if should_write_header:
write_header(writer, columns)
writer.writerows(rows) writer.writerows(rows)