From 7dcbad1ba8a8f65cc9ad8724f881db0d454d3031 Mon Sep 17 00:00:00 2001 From: Pete Herlihy Date: Fri, 15 Jun 2018 15:30:45 +0100 Subject: [PATCH] Tidied up the formatting on the feedback tickets --- app/main/views/feedback.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py index 0a641a14b..7269a9b59 100644 --- a/app/main/views/feedback.py +++ b/app/main/views/feedback.py @@ -103,23 +103,22 @@ def feedback(ticket_type): user_email = form.email_address.data user_name = form.name.data or None if current_service: - service_string = 'Service "{name}": {url}\n'.format( + service_string = 'Service: "{name}"\n{url}\n'.format( name=current_service['name'], url=url_for('main.service_dashboard', service_id=current_service['id'], _external=True) ) else: service_string = '' - feedback_msg = 'Environment: {}\n{}{}\n{}'.format( - url_for('main.index', _external=True), + feedback_msg = '{}\n{}{}'.format( + form.feedback.data service_string, '' if user_email else '{} (no email address supplied)'.format(form.name.data), - form.feedback.data ) zendesk_client.create_ticket( subject='Notify feedback', - message=feedback_msg, + feedback_msg, ticket_type=ticket_type, p1=p1, user_email=user_email,