diff --git a/app/models/organisation.py b/app/models/organisation.py index 5b5e5272a..5ddffaf88 100644 --- a/app/models/organisation.py +++ b/app/models/organisation.py @@ -101,9 +101,6 @@ class Organisation(JSONModel): self.request_to_go_live_notes = None self.email_branding_id = None - def as_info_for_branding_request(self, fallback_domain): - return self.name or 'Can’t tell (domain is {})'.format(fallback_domain) - @property def organisation_type_label(self): return dict(self.TYPES).get(self.organisation_type) diff --git a/app/templates/support-tickets/branding-request.txt b/app/templates/support-tickets/branding-request.txt index eeffdc67d..da55691d0 100644 --- a/app/templates/support-tickets/branding-request.txt +++ b/app/templates/support-tickets/branding-request.txt @@ -1,4 +1,8 @@ -Organisation: {{ current_service.organisation.as_info_for_branding_request(current_user.email_domain) }} +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) }}