darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 16:24:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove set-to-string conversion from upload code

Browse Source 
Also changes the allowed_spreadsheet_file_extensions
variable to allowed_file_extensions for
consistency.
This commit is contained in:
Tom Byers
2020-12-17 10:47:52 +00:00
parent ea3d61e6b9
commit 55a4ca6579
16 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/send.py
View File

@@ -187,7 +187,6 @@ def send_messages(service_id, template_id):
))
column_headings = get_spreadsheet_column_headings_from_template(template)
allowed_spreadsheet_file_extensions = ','.join([f'.{ext}' for ext in Spreadsheet.ALLOWED_FILE_EXTENSIONS])
return render_template(
'views/send.html',
@@ -195,7 +194,7 @@ def send_messages(service_id, template_id):
column_headings=list(ascii_uppercase[:len(column_headings)]),
example=[column_headings, get_example_csv_rows(template)],
form=form,
allowed_spreadsheet_file_extensions=allowed_spreadsheet_file_extensions
allowed_file_extensions=Spreadsheet.ALLOWED_FILE_EXTENSIONS
)
@@ -711,7 +710,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
def check_messages(service_id, template_id, upload_id, row_index=2):
data = _check_messages(service_id, template_id, upload_id, row_index)
data['allowed_spreadsheet_file_extensions'] = ','.join([f'.{ext}' for ext in Spreadsheet.ALLOWED_FILE_EXTENSIONS])
data['allowed_file_extensions'] = Spreadsheet.ALLOWED_FILE_EXTENSIONS
if (
data['recipients'].too_many_rows