app/templates/support-tickets/branding-request.txt

Organisation: {% if current_service.organisation -%}
  {{ current_service.organisation.name }}
{%- else -%}
  Can’t tell (domain is {{ current_user.email_domain }})
{%- endif %}
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 %}
-												Move branding info from model

This was an awkward property to have in a model class because
- it’s presentation not data about the object
- it munged together data from a different object, so it wasn’t well
  encapsulated

This commit moves the logic to the template, where it can reference the
`Organisation` and `User` models directly.

											
										
										
											2021-10-26 18:11:27 +01:00
+								Organisation: {% if current_service.organisation -%}
 								  {{ current_service.organisation.name }}
 								{%- else -%}
 								  Can’t tell (domain is {{ current_user.email_domain }})
 								{%- endif %}
-												Use Jinja template for branding request tickets

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.

											
										
										
											2021-10-26 18:06:26 +01:00
+								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 %}