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

update test

Browse Source
This commit is contained in:
Beverly Nguyen
2024-02-23 15:02:18 -08:00
parent fd340ed105
commit d08968a348
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,14 +52,12 @@ def get_example_csv_fields(column_headers, use_example_as_example, submitted_fie
def get_example_csv_rows(template, use_example_as_example=True, submitted_fields=False): def get_example_csv_rows(template, use_example_as_example=True, submitted_fields=False):
return { return {
"email": ( "email": ["test@example.com"]
["test@example.com"] if use_example_as_example
if use_example_as_example else [current_user.email_address],
else [current_user.email_address] "sms": ["12223334444"]
), if use_example_as_example
"sms": ( else [current_user.mobile_number],
["12223334444"] if use_example_as_example else [current_user.mobile_number]
),
}[template.template_type] + get_example_csv_fields( }[template.template_type] + get_example_csv_fields(
( (
placeholder placeholder
@@ -513,14 +511,12 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
template=template, template=template,
max_initial_rows_shown=50, max_initial_rows_shown=50,
max_errors_shown=50, max_errors_shown=50,
guestlist=( guestlist=itertools.chain.from_iterable(
itertools.chain.from_iterable( [user.name, user.mobile_number, user.email_address]
[user.name, user.mobile_number, user.email_address] for user in Users(service_id)
for user in Users(service_id) )
) if current_service.trial_mode
if current_service.trial_mode else None,
else None
),
remaining_messages=remaining_messages, remaining_messages=remaining_messages,
allow_international_sms=current_service.has_permission("international_sms"), allow_international_sms=current_service.has_permission("international_sms"),
) )

12
app/templates/views/notifications/notification.html
View File

@@ -20,13 +20,13 @@
{{ page_header( {{ page_header(
1|message_count_label(template.template_type, suffix='') | capitalize 1|message_count_label(template.template_type, suffix='') | capitalize
) }} ) }}
<p> <p>
{% if help %} {% if help %}
‘{{ template.name }}’ ‘{{ template.name }}’
{% else %} {% else %}
<a class="usa-link" href="{{ url_for('.view_template', service_id=current_service.id, template_id=template.id) }}">‘{{ template.name }}’</a> <a class="usa-link" href="{{ url_for('.view_template', service_id=current_service.id, template_id=template.id) }}">‘{{ template.name }}’</a>
{% endif %} {% endif %}
was sent was sent
{% if job and job.original_file_name != 'Report' %} {% if job and job.original_file_name != 'Report' %}
{% set destination = {% set destination =
{'email': 'an email address', 'sms': 'a phone number'} %} {'email': 'an email address', 'sms': 'a phone number'} %}
@@ -36,7 +36,7 @@
by {{ created_by.name }} by {{ created_by.name }}
{% endif %} {% endif %}
{{ created_at|format_datetime_human }} {{ created_at|format_datetime_human }}
</p> </p>
<div class=""> <div class="">
{{ template|string }} {{ template|string }}