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

Merge pull request #1525 from alphagov/only-mandate-mandatory-columns

Browse Source 
Only mandate mandatory address columns
This commit is contained in:
Chris Hill-Scott
2017-10-04 10:14:39 +01:00
committed by GitHub
parent 775fa1ac2d 4154dbba1f
commit 61ce4c5a02
3 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
import itertools
from string import ascii_uppercase
from orderedset import OrderedSet
from contextlib import suppress
from zipfile import BadZipFile
from xlrd.biffh import XLRDError
@@ -445,6 +446,7 @@ def _check_messages(service_id, template_type, upload_id, letters_as_pdf=False):
template.template_type == 'letter',
not request.args.get('from_test'),
)),
required_recipient_columns=OrderedSet(recipients.recipient_column_headers) - optional_address_columns
)

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

@@ -48,7 +48,7 @@
{% 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 }}">
Your file needs {{ recipients.recipient_column_headers | formatted_list(
Your file needs {{ required_recipient_columns | formatted_list(
prefix='a column called',
prefix_plural='columns called'
) }}