From 8d38215e86d232f1d8d3562936295a9581ffd383 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 16 Nov 2017 13:35:17 +0000 Subject: [PATCH] Remove confusing argument name Brings in new utils which changes the name of this argument to be closer to what the API uses. --- app/__init__.py | 4 ++-- app/utils.py | 3 ++- requirements.txt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 93c2b2078..46e1dd8c9 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -24,7 +24,7 @@ from flask_wtf.csrf import CSRFError from functools import partial from notifications_python_client.errors import HTTPError -from notifications_utils import logging, request_id, formatters +from notifications_utils import logging, request_helper, formatters from notifications_utils.clients.statsd.statsd_client import StatsdClient from notifications_utils.recipients import ( validate_phone_number, @@ -93,7 +93,7 @@ def create_app(application): statsd_client.init_app(application) logging.init_app(application, statsd_client) init_csrf(application) - request_id.init_app(application) + request_helper.init_app(application) service_api_client.init_app(application) user_api_client.init_app(application) diff --git a/app/utils.py b/app/utils.py index 5b1052567..47fd1f6f8 100644 --- a/app/utils.py +++ b/app/utils.py @@ -288,7 +288,8 @@ def get_template( return SMSPreviewTemplate( template, prefix=service['name'], - sender=not service['prefix_sms'], + show_prefix=service['prefix_sms'], + sender=sms_sender, show_recipient=show_recipient, redact_missing_personalisation=redact_missing_personalisation, ) diff --git a/requirements.txt b/requirements.txt index 74229a332..2f60866a5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,4 +21,4 @@ notifications-python-client==4.6.0 awscli>=1.11,<1.12 awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@21.5.0#egg=notifications-utils==21.5.0 +git+https://github.com/alphagov/notifications-utils.git@23.0.0#egg=notifications-utils==23.0.0