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

Merge pull request #1636 from alphagov/dont-list-all-address-columns

Browse Source 
Don’t list all letter address cols if some missing
This commit is contained in:
Chris Hill-Scott
2017-11-16 11:44:36 +00:00
committed by GitHub
parent 65f20694cc 6995ddc8f5
commit 9afd047226
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,10 @@
{% elif not recipients.has_recipient_columns %} {% elif not recipients.has_recipient_columns %}
<h1 class='banner-title' data-module="track-error" data-error-type="Missing recipient columns" data-error-label="{{ upload_id }}"> <h1 class='banner-title' data-module="track-error" data-error-type="Missing recipient columns" data-error-label="{{ upload_id }}">
Your file needs {{ required_recipient_columns | formatted_list( Your file needs {{ (
recipients.missing_column_headers
if template.template_type == 'letter' else required_recipient_columns
) | formatted_list(
prefix='a column called', prefix='a column called',
prefix_plural='columns called' prefix_plural='columns called'
) }} ) }}

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

@@ -1883,7 +1883,7 @@ def test_check_messages_column_error_doesnt_show_optional_columns(
) )
assert normalize_spaces(page.select_one('.banner-dangerous').text) == ( assert normalize_spaces(page.select_one('.banner-dangerous').text) == (
'Your file needs columns called ‘address line 1’, ‘address line 2’ and ‘postcode’ ' 'Your file needs a column called ‘postcode’ '
'Right now it has columns called ‘address_line_1’, ‘address_line_2’ and ‘foo’. ' 'Right now it has columns called ‘address_line_1’, ‘address_line_2’ and ‘foo’. '
'Skip to file contents' 'Skip to file contents'
) )