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

Merge pull request #2725 from alphagov/job-sent-already

Browse Source 
Warn if a file has been sent already
This commit is contained in:
Chris Hill-Scott
2019-02-05 14:55:08 +00:00
committed by GitHub
parent 975dce9f43 88f9d156c7
commit ce04c9c45a
6 changed files with 105 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -609,6 +609,9 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
)),
required_recipient_columns=OrderedSet(recipients.recipient_column_headers) - optional_address_columns,
preview_row=preview_row,
sent_previously=job_api_client.has_sent_previously(
service_id, template.id, db_template['version'], request.args.get('original_file_name', '')
)
)
@@ -625,7 +628,8 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
not data['count_of_recipients'] or
not data['recipients'].has_recipient_columns or
data['recipients'].duplicate_recipient_column_headers or
data['recipients'].missing_column_headers
data['recipients'].missing_column_headers or
data['sent_previously']
):
return render_template('views/check/column-errors.html', **data)