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

Merge pull request #1250 from alphagov/validate-international-csv

Browse Source 
Allow international phone numbers in spreadsheet
This commit is contained in:
Chris Hill-Scott
2017-04-27 14:27:52 +01:00
committed by GitHub
parent da8935d619 fd7a34f1e4
commit ca90c922ed
4 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,7 @@ 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):
return {
'email': ['test@example.com'] if use_example_as_example else [current_user.email_address],
'sms': ['07700 900321'] if use_example_as_example else [validate_and_format_phone_number(
current_user.mobile_number, human_readable=True
)],
'sms': ['07700 900321'] if use_example_as_example else [current_user.mobile_number],
'letter': [
(submitted_fields or {}).get(
key, get_example_letter_address(key) if use_example_as_example else key
@@ -220,7 +218,6 @@ def _check_messages(service_id, template_type, upload_id, letters_as_pdf=False):
upload_id=upload_id
) if not letters_as_pdf else None
)
recipients = RecipientCSV(
contents,
template_type=template.template_type,
@@ -230,7 +227,8 @@ def _check_messages(service_id, template_type, upload_id, letters_as_pdf=False):
whitelist=itertools.chain.from_iterable(
[user.name, user.mobile_number, user.email_address] for user in users
) if current_service['restricted'] else None,
remaining_messages=remaining_messages
remaining_messages=remaining_messages,
international_sms=current_service['can_send_international_sms'],
)
if request.args.get('from_test'):