Merge branch 'master' into download_link-activity-page

app/main/forms.py

@@ -839,3 +839,13 @@ class SetSenderForm(StripWhitespaceForm):
         self.sender.label.text = kwargs['sender_label']
 
     sender = RadioField()
+
+
+class SetTemplateSenderForm(StripWhitespaceForm):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.sender.choices = kwargs['sender_choices']
+        self.sender.label.text = 'Select your sender'
+
+    sender = RadioField()

app/main/views/notifications.py

@@ -16,7 +16,7 @@ from app import (
     current_service,
     format_date_numeric)
 from app.main import main
-from app.template_previews import TemplatePreview
+from app.template_previews import TemplatePreview, get_page_count_for_letter
 from app.utils import (
     user_has_permissions,
     get_help_argument,
@@ -33,6 +33,8 @@ from app.utils import (
 @user_has_permissions('view_activity', admin_override=True)
 def view_notification(service_id, notification_id):
     notification = notification_api_client.get_notification(service_id, str(notification_id))
+    notification['template'].update({'reply_to_text': notification['reply_to_text']})
+
     template = get_template(
         notification['template'],
         current_service,
@@ -42,6 +44,7 @@ def view_notification(service_id, notification_id):
             notification_id=notification_id,
             filetype='png',
         ),
+        page_count=get_page_count_for_letter(notification['template']),
         show_recipient=True,
         redact_missing_personalisation=True,
     )
@@ -83,6 +86,7 @@ def view_letter_notification_as_preview(service_id, notification_id, filetype):
         abort(404)
 
     notification = notification_api_client.get_notification(service_id, notification_id)
+    notification['template'].update({'reply_to_text': notification['reply_to_text']})
 
     template = get_template(
         notification['template'],

app/main/views/service_settings.py

@@ -553,6 +553,10 @@ def service_add_letter_contact(service_id):
             contact_block=form.letter_contact_block.data.replace('\r', '') or None,
             is_default=first_contact_block if first_contact_block else form.is_default.data
         )
+        if request.args.get('from_template'):
+            return redirect(
+                url_for('.set_template_sender', service_id=service_id, template_id=request.args.get('from_template'))
+            )
         return redirect(url_for('.service_letter_contact_details', service_id=service_id))
     return render_template(
         'views/service-settings/letter-contact/add.html',

app/main/views/templates.py

@@ -12,7 +12,9 @@ from flask import (
 )
 from flask_login import login_required, current_user
 from dateutil.parser import parse
+from markupsafe import Markup
 
+from notifications_utils.formatters import nl2br
 from notifications_utils.recipients import first_column_headings
 from notifications_utils.template import LetterDVLATemplate
 from notifications_python_client.errors import HTTPError
@@ -26,8 +28,9 @@ from app.main.forms import (
     EmailTemplateForm,
     LetterTemplateForm,
     SearchTemplatesForm,
+    SetTemplateSenderForm,
 )
-from app.main.views.send import get_example_csv_rows
+from app.main.views.send import get_example_csv_rows, get_sender_details
 from app import service_api_client, current_service, template_statistics_client
 
 
@@ -181,6 +184,7 @@ def view_letter_template_preview(service_id, template_id, filetype):
         abort(404)
 
     db_template = service_api_client.get_service_template(service_id, template_id)['data']
+
     return TemplatePreview.from_database_object(db_template, filetype, page=request.args.get('page'))
 
 
@@ -373,7 +377,8 @@ def edit_service_template(service_id, template_id):
             'subject': subject,
             'template_type': template['template_type'],
             'id': template['id'],
-            'process_type': form.process_type.data
+            'process_type': form.process_type.data,
+            'reply_to_text': template['reply_to_text']
         }, current_service)
         template_change = get_template(template, current_service).compare_to(new_template)
         if template_change.placeholders_added and not request.form.get('confirm'):
@@ -564,6 +569,65 @@ def view_template_versions(service_id, template_id):
     )
 
 
+@main.route('/services/<service_id>/templates/<template_id>/set-template-sender', methods=['GET', 'POST'])
+@login_required
+@user_has_permissions('manage_templates', admin_override=True)
+def set_template_sender(service_id, template_id):
+    template = service_api_client.get_service_template(service_id, template_id)['data']
+    sender_details = get_template_sender_form_dict(service_id, template)
+    no_senders = sender_details.get('no_senders', False)
+
+    form = SetTemplateSenderForm(
+        sender=sender_details['current_choice'],
+        sender_choices=sender_details['value_and_label'],
+    )
+    option_hints = {sender_details['default_sender']: '(Default)'}
+
+    if form.validate_on_submit():
+        service_api_client.update_service_template_sender(
+            service_id,
+            template_id,
+            form.sender.data if form.sender.data else None,
+        )
+        return redirect(url_for('.view_template', service_id=service_id, template_id=template_id))
+
+    return render_template(
+        'views/templates/set-template-sender.html',
+        form=form,
+        template_id=template_id,
+        no_senders=no_senders,
+        option_hints=option_hints
+    )
+
+
+def get_template_sender_form_dict(service_id, template):
+    context = {
+        'email': {
+            'field_name': 'email_address'
+        },
+        'letter': {
+            'field_name': 'contact_block'
+        },
+        'sms': {
+            'field_name': 'sms_sender'
+        }
+    }[template['template_type']]
+
+    sender_format = context['field_name']
+    service_senders = get_sender_details(service_id, template['template_type'])
+    context['default_sender'] = next(
+        (x['id'] for x in service_senders if x['is_default']), "Not set"
+    )
+    if not service_senders:
+        context['no_senders'] = True
+
+    context['value_and_label'] = [(sender['id'], Markup(nl2br(sender[sender_format]))) for sender in service_senders]
+    context['value_and_label'].insert(0, ('', 'Blank'))  # Add blank option to start of list
+
+    context['current_choice'] = template['service_letter_contact'] if template['service_letter_contact'] else ''
+    return context
+
+
 def get_last_use_message(template_name, template_statistics):
     try:
         most_recent_use = max(