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

Refactor page_count checks to avoid magic numbers

Browse Source
This commit is contained in:
Pea Tyczynska
2019-10-01 16:03:35 +01:00
parent 028d156dc7
commit b42c7c4c9f
7 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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) and page_count < 11 %}
{% if (template.template_type != 'letter' or not request.args.from_test) and (not page_count or page_count <= letter_max_pages) %}
<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>

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

@@ -66,7 +66,7 @@
help='3' if help else 0
)}}" class='page-footer'>
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
{% if not error and page_count < 11 %}
{% if not error and (not page_count or page_count <= letter_max_pages) %}
<button type="submit" class="button">Send 1 {{ message_count_label(1, template.template_type, suffix='') }}</button>
{% endif %}
{% if template.template_type == 'letter' %}

2
app/templates/views/templates/_template.html
View File

@@ -15,7 +15,7 @@
<div class="bottom-gutter-2-3">
<div class="grid-row">
{% if template.template_type == 'letter' %}
{% if current_user.has_permissions('send_messages', restrict_admin_usage=True) and page_count < 11 %}
{% if current_user.has_permissions('send_messages', restrict_admin_usage=True) and page_count <= letter_max_pages %}
<div class="column-half">
<a href="{{ url_for(".set_sender", service_id=current_service.id, template_id=template.id) }}" class="pill-separate-item">
Send