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

Merge pull request #235 from alphagov/fix-bad-first-column

Browse Source 
Validate column heading.
This commit is contained in:
Chris Hill-Scott
2016-03-04 11:38:57 +00:00
parent e1de40429c e3c692ede7
commit 049004c1b3
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,8 @@ from app.main.dao import templates_dao
from app.main.dao import services_dao
from app import job_api_client
from app.utils import (
validate_recipient, InvalidPhoneError, InvalidEmailError, user_has_permissions)
validate_recipient, validate_header_row, InvalidPhoneError, InvalidEmailError, user_has_permissions,
InvalidHeaderError)
from utils.process_csv import first_column_heading
@@ -284,6 +285,7 @@ def _get_rows(contents, raw_template):
values=row,
drop_values={first_column_heading[raw_template['template_type']]}
).replaced
except (InvalidEmailError, InvalidPhoneError, NeededByTemplateError, NoPlaceholderForDataError):
except (InvalidEmailError, InvalidPhoneError, NeededByTemplateError,
NoPlaceholderForDataError, InvalidHeaderError):
valid = False
return {"valid": valid, "rows": rows}