diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 7d003239f..11767f949 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -705,13 +705,13 @@ def service_letter_contact_details(service_id): def service_add_letter_contact(service_id): form = ServiceLetterContactBlockForm() first_contact_block = current_service.count_letter_contact_details == 0 + from_template = request.args.get('from_template') if form.validate_on_submit(): new_letter_contact = service_api_client.add_letter_contact( current_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 ) - from_template = request.args.get('from_template') if from_template: service_api_client.update_service_template_sender( service_id, @@ -726,6 +726,11 @@ def service_add_letter_contact(service_id): 'views/service-settings/letter-contact/add.html', form=form, first_contact_block=first_contact_block, + back_link=( + url_for('main.view_template', template_id=from_template, service_id=current_service.id) + if from_template + else url_for('.service_letter_contact_details', service_id=current_service.id) + ), ) diff --git a/app/templates/views/service-settings/letter-contact/add.html b/app/templates/views/service-settings/letter-contact/add.html index 6e91ad984..6f6e488c7 100644 --- a/app/templates/views/service-settings/letter-contact/add.html +++ b/app/templates/views/service-settings/letter-contact/add.html @@ -13,7 +13,7 @@ {{ page_header( 'Add a new address', - back_link=url_for('main.view_template', template_id=request.args.get('from_template'), service_id=current_service.id) if request.args.get('from_template') else url_for('.service_letter_contact_details', service_id=current_service.id) + back_link=back_link ) }}