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

Stop checking query string for filename when sending a job

Browse Source 
We look for `original_file_name` in the metadata now. Initially we were
still checking the query string too, but now that the change to add the
filename to the metadata has been deployed for a while there shouldn't
be any cases of the filename still being in a query string.

Since the `original_file_name` is not being added to the metadata in
`.check_messages` (it has happened earlier in the process) a few tests
are no longer needed.
This commit is contained in:
Katie Smith
2020-10-27 10:52:16 +00:00
parent 18e4e86565
commit 247e7c2d93
2 changed files with 2 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,10 +668,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
abort(404)
page_count = get_page_count_for_letter(db_template, template.values)
# TODO: stop checking the request.args for original_file_name once this change has been deployed for a
# while and we are confident it's only coming from metadata
metadata = get_csv_metadata(service_id, upload_id)
original_file_name = metadata.get('original_file_name', request.args.get('original_file_name', ''))
original_file_name = get_csv_metadata(service_id, upload_id).get('original_file_name', '')
return dict(
recipients=recipients,
@@ -732,16 +729,11 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
):
return render_template('views/check/column-errors.html', **data)
data['original_file_name'] = SanitiseASCII.encode(data.get('original_file_name', ''))
metadata_kwargs = {
'notification_count': data['count_of_recipients'],
'template_id': template_id,
'valid': True,
'original_file_name': unicode_truncate(
data['original_file_name'],
1600,
),
'original_file_name': data.get('original_file_name', ''),
}
if session.get('sender_id'):