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

Do not allow to send job of letters if letters longer than 10 pages

Browse Source
This commit is contained in:
Pea Tyczynska
2019-10-01 15:34:46 +01:00
parent c690434b1f
commit 028d156dc7
3 changed files with 65 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -522,6 +522,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
email_reply_to = get_email_reply_to_address_from_session()
elif db_template['template_type'] == 'sms':
sms_sender = get_sms_sender_from_session()
page_count = get_page_count_for_letter(db_template)
template = get_template(
db_template,
current_service,
@@ -536,7 +537,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
) if not letters_as_pdf else None,
email_reply_to=email_reply_to,
sms_sender=sms_sender,
page_count=get_page_count_for_letter(db_template),
page_count=page_count,
)
recipients = RecipientCSV(
contents,
@@ -589,7 +590,8 @@ def _check_messages(service_id, template_id, upload_id, preview_row, letters_as_
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', '')
)
),
page_count=page_count
)
@@ -601,12 +603,12 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
data = _check_messages(service_id, template_id, upload_id, row_index)
if (
data['recipients'].too_many_rows or
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 or
data['sent_previously']
data['recipients'].too_many_rows
or 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
or data['sent_previously']
):
return render_template('views/check/column-errors.html', **data)
@@ -614,8 +616,8 @@ def check_messages(service_id, template_id, upload_id, row_index=2):
return render_template('views/check/row-errors.html', **data)
if (
data['errors'] or
data['trying_to_send_letters_in_trial_mode']
data['errors']
or data['trying_to_send_letters_in_trial_mode']
):
return render_template('views/check/column-errors.html', **data)

2
app/templates/views/check/ok.html
View File

@@ -39,7 +39,7 @@
wrapping_class='bottom-gutter-2-3'
) }}
{% endif %}
{% if template.template_type != 'letter' or not request.args.from_test %}
{% if (template.template_type != 'letter' or not request.args.from_test) and page_count < 11 %}
<button type="submit" class="button">Send {{ count_of_recipients }} {{ message_count_label(count_of_recipients, template.template_type, suffix='') }}</button>
{% else %}
<a href="{{ url_for('main.check_messages_preview', service_id=current_service.id, template_id=template.id, upload_id=upload_id, filetype='pdf') }}" download class="button">Download as a PDF</a>