darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 00:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use Jinja template for branding request tickets

Browse Source 
Following the pattern established by
https://github.com/alphagov/notifications-admin/pull/4041/files
this commit move the ticket message from a Python f-string to a proper
templating language.
This commit is contained in:
Chris Hill-Scott
2021-10-26 18:06:26 +01:00
parent 2308dad0d2
commit a145c501ab
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/main/views/service_settings.py
View File

@@ -1173,27 +1173,15 @@ def branding_request(service_id, branding_type):
elif branding_type == "letter": elif branding_type == "letter":
branding_name = current_service.letter_branding_name branding_name = current_service.letter_branding_name
if form.validate_on_submit(): if form.validate_on_submit():
ticket_message = render_template(
'support-tickets/branding-request.txt',
current_branding=branding_name,
branding_requested=dict(form.options.choices)[form.options.data],
detail=form.something_else.data,
)
ticket = NotifySupportTicket( ticket = NotifySupportTicket(
subject=f'{branding_type.capitalize()} branding request - {current_service.name}', subject=f'{branding_type.capitalize()} branding request - {current_service.name}',
message=( message=ticket_message,
'Organisation: {organisation}\n'
'Service: {service_name}\n'
'{dashboard_url}\n'
'\n---'
'\nCurrent branding: {current_branding}'
'\nBranding requested: {branding_requested}'
'{new_paragraph}'
'{detail}'
'\n'
).format(
organisation=current_service.organisation.as_info_for_branding_request(current_user.email_domain),
service_name=current_service.name,
dashboard_url=url_for('main.service_dashboard', service_id=current_service.id, _external=True),
current_branding=branding_name,
branding_requested=dict(form.options.choices)[form.options.data],
new_paragraph='\n\n' if form.something_else.data else '',
detail=form.something_else.data or ''
),
ticket_type=NotifySupportTicket.TYPE_QUESTION, ticket_type=NotifySupportTicket.TYPE_QUESTION,
user_name=current_user.name, user_name=current_user.name,
user_email=current_user.email_address, user_email=current_user.email_address,

10
app/templates/support-tickets/branding-request.txt Normal file
View File

@@ -0,0 +1,10 @@
Organisation: {{ current_service.organisation.as_info_for_branding_request(current_user.email_domain) }}
Service: {{ current_service.name }}
{{ url_for('main.service_dashboard', service_id=current_service.id, _external=True) }}
---
Current branding: {{ current_branding }}
Branding requested: {{ branding_requested }}
{% if detail %}
{{ detail }}
{% endif %}