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

Persist original file name when previewing row

Browse Source
This commit is contained in:
Chris Hill-Scott
2018-05-21 10:30:09 +01:00
parent e74d408953
commit ea6620083b
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/views/check/column-errors.html
View File

@@ -168,7 +168,7 @@
(not errors or recipients.more_rows_than_can_send) and (not errors or recipients.more_rows_than_can_send) and
displayed_index != preview_row displayed_index != preview_row
) %} ) %}
<a href="{{ url_for('.check_messages', service_id=current_service.id, template_id=template.id, upload_id=upload_id, row_index=displayed_index) }}">{{ displayed_index }}</a> <a href="{{ url_for('.check_messages', service_id=current_service.id, template_id=template.id, upload_id=upload_id, row_index=displayed_index, original_file_name=original_file_name) }}">{{ displayed_index }}</a>
{% else %} {% else %}
{{ displayed_index }} {{ displayed_index }}
{% endif %} {% endif %}

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

@@ -63,7 +63,7 @@
{% if (item.index + 2) == preview_row %} {% if (item.index + 2) == preview_row %}
{{ item.index + 2 }} {{ item.index + 2 }}
{% else %} {% else %}
<a href="{{ url_for('.check_messages', service_id=current_service.id, template_id=template.id, upload_id=upload_id, row_index=(item.index + 2)) }}">{{ item.index + 2 }}</a> <a href="{{ url_for('.check_messages', service_id=current_service.id, template_id=template.id, upload_id=upload_id, row_index=(item.index + 2), original_file_name=original_file_name) }}">{{ item.index + 2 }}</a>
{% endif %} {% endif %}
</span> </span>
{% endcall %} {% endcall %}

7
tests/app/main/views/test_send.py
View File

@@ -615,7 +615,12 @@ def test_upload_valid_csv_shows_preview_and_table(
if expected_link_in_first_row: if expected_link_in_first_row:
assert page.select_one('.table-field-index a')['href'] == url_for( assert page.select_one('.table-field-index a')['href'] == url_for(
'main.check_messages', service_id=SERVICE_ONE_ID, template_id=fake_uuid, upload_id=fake_uuid, row_index=2 'main.check_messages',
service_id=SERVICE_ONE_ID,
template_id=fake_uuid,
upload_id=fake_uuid,
row_index=2,
original_file_name='example.csv',
) )
else: else:
assert not page.select_one('.table-field-index').select_one('a') assert not page.select_one('.table-field-index').select_one('a')